===== sql_table.cc 1.444 vs edited ===== 1545c1545,1546 < bool some_tables_deleted=0, tmp_table_deleted=0, foreign_key_error=0; --- > my_bool some_tables_deleted= 0, tmp_table_deleted= 0; > my_bool foreign_key_error= 0, table_locked_error= 0; 1711a1713,1715 > else if (error == HA_ERR_LOCK_OR_ACTIVE_TRANSACTION) > table_locked_error =1; > 1744c1748,1752 < if (!foreign_key_error) --- > if (foreign_key_error) > my_message(ER_ROW_IS_REFERENCED, ER(ER_ROW_IS_REFERENCED), MYF(0)); > else if (table_locked_error) > my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0)); > else 1747,1748c1755 < else < my_message(ER_ROW_IS_REFERENCED, ER(ER_ROW_IS_REFERENCED), MYF(0)); --- >