diff options
| author | unknown <serg@serg.mylan> | 2005-04-02 20:28:58 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-04-02 20:28:58 +0200 |
| commit | 5f8c654a0af82a44aad68c64b9f9939a5a3357c5 (patch) | |
| tree | 06ded7248852f9d5def80d85b0d9698611a769f3 /sql/sql_table.cc | |
| parent | ab77d7d7633a2cff057b17ec43233d4f0d0b0822 (diff) | |
| parent | 7d865e0b12f98855d6b8687586a994f91764bc75 (diff) | |
| download | mariadb-git-5f8c654a0af82a44aad68c64b9f9939a5a3357c5.tar.gz | |
merged
mysql-test/r/drop.result:
Auto merged
mysql-test/t/drop.test:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
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 fffef49effc..5aba764e293 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -260,7 +260,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_error(ER_ROW_IS_REFERENCED, MYF(0)); error= 1; |