diff options
| author | unknown <dlenev@mysql.com> | 2005-04-03 10:36:18 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-04-03 10:36:18 +0400 |
| commit | da70ad5499e593bfd367113a3caaf58d0f7a5193 (patch) | |
| tree | 184cd404bfe7f2755c03e529337679847bd6fa21 /sql/sql_table.cc | |
| parent | cdad0890fe17e93c8fa60cf2c34c4036808f96c3 (diff) | |
| parent | 98e615ba35952f3999f26aaa567b4744a71fbfdc (diff) | |
| download | mariadb-git-da70ad5499e593bfd367113a3caaf58d0f7a5193.tar.gz | |
Merge of patch for bug #3891 into 5.0 tree.
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.
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index b125eeaf03a..e2dcd71afb4 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -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; |