mirror of
https://github.com/MariaDB/server.git
synced 2025-12-10 19:44:09 +03:00
branches/zip: Fix two mistakes made in r1414
(merging branches/fast-index-creation): row_truncate_table_for_mysql(), row_drop_table_for_mysql_no_commit(): Let ut_print_name() output to ef instead of stderr.
This commit is contained in:
@@ -2953,10 +2953,10 @@ row_truncate_table_for_mysql(
|
|||||||
ut_print_timestamp(ef);
|
ut_print_timestamp(ef);
|
||||||
|
|
||||||
fputs(" Cannot truncate table ", ef);
|
fputs(" Cannot truncate table ", ef);
|
||||||
ut_print_name(stderr, trx, TRUE, table->name);
|
ut_print_name(ef, trx, TRUE, table->name);
|
||||||
fputs(" by DROP+CREATE\n"
|
fputs(" by DROP+CREATE\n"
|
||||||
"InnoDB: because it is referenced by ", ef);
|
"InnoDB: because it is referenced by ", ef);
|
||||||
ut_print_name(stderr, trx, TRUE, foreign->foreign_table_name);
|
ut_print_name(ef, trx, TRUE, foreign->foreign_table_name);
|
||||||
putc('\n', ef);
|
putc('\n', ef);
|
||||||
mutex_exit(&dict_foreign_err_mutex);
|
mutex_exit(&dict_foreign_err_mutex);
|
||||||
|
|
||||||
@@ -3329,10 +3329,10 @@ check_next_foreign:
|
|||||||
ut_print_timestamp(ef);
|
ut_print_timestamp(ef);
|
||||||
|
|
||||||
fputs(" Cannot drop table ", ef);
|
fputs(" Cannot drop table ", ef);
|
||||||
ut_print_name(stderr, trx, TRUE, name);
|
ut_print_name(ef, trx, TRUE, name);
|
||||||
fputs("\n"
|
fputs("\n"
|
||||||
"because it is referenced by ", ef);
|
"because it is referenced by ", ef);
|
||||||
ut_print_name(stderr, trx, TRUE, foreign->foreign_table_name);
|
ut_print_name(ef, trx, TRUE, foreign->foreign_table_name);
|
||||||
putc('\n', ef);
|
putc('\n', ef);
|
||||||
mutex_exit(&dict_foreign_err_mutex);
|
mutex_exit(&dict_foreign_err_mutex);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user