database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge of patch for bug #3891 into 5.0 tree.

Browse Source 
BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_table.cc:
  Manual merge.
This commit is contained in:
unknown
2005-04-03 10:36:18 +04:00
parent cdad0890fe 98e615ba35
commit da70ad5499
3 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_table.cc
View File

@ -273,7 +273,8 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
if (wrong_tables.length())
{
if (!foreign_key_error)
my_error(ER_BAD_TABLE_ERROR, MYF(0), wrong_tables.c_ptr());
my_printf_error(ER_BAD_TABLE_ERROR, ER(ER_BAD_TABLE_ERROR), MYF(0),
wrong_tables.c_ptr());
else
my_message(ER_ROW_IS_REFERENCED, ER(ER_ROW_IS_REFERENCED), MYF(0));
error= 1;