Commit 491d1068 authored by marko's avatar marko

Use "InnoDB:" prefix in error messages.

parent d7f1b3dc
...@@ -3431,7 +3431,7 @@ no_commit: ...@@ -3431,7 +3431,7 @@ no_commit:
/* /*
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fprintf(stderr, fprintf(stderr,
" InnoDB error: ALTER TABLE is holding lock" " InnoDB: ALTER TABLE is holding lock"
" on %lu tables!\n", " on %lu tables!\n",
prebuilt->trx->mysql_n_tables_locked); prebuilt->trx->mysql_n_tables_locked);
*/ */
...@@ -6589,13 +6589,16 @@ ha_innobase::transactional_table_lock( ...@@ -6589,13 +6589,16 @@ ha_innobase::transactional_table_lock(
if (prebuilt->table->ibd_file_missing && !thd_tablespace_op(thd)) { if (prebuilt->table->ibd_file_missing && !thd_tablespace_op(thd)) {
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fprintf(stderr, " InnoDB error:\n" fprintf(stderr,
"MySQL is trying to use a table handle but the .ibd file for\n" " InnoDB: MySQL is trying to use a table handle"
"table %s does not exist.\n" " but the .ibd file for\n"
"Have you deleted the .ibd file from the database directory under\n" "InnoDB: table %s does not exist.\n"
"the MySQL datadir?" "InnoDB: Have you deleted the .ibd file"
"See http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html\n" " from the database directory under\n"
"how you can resolve the problem.\n", "InnoDB: the MySQL datadir?"
"InnoDB: See"
" http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html\n"
"InnoDB: how you can resolve the problem.\n",
prebuilt->table->name); prebuilt->table->name);
DBUG_RETURN(HA_ERR_CRASHED); DBUG_RETURN(HA_ERR_CRASHED);
} }
......
...@@ -830,7 +830,7 @@ sync_thread_levels_g( ...@@ -830,7 +830,7 @@ sync_thread_levels_g(
mutex = slot->latch; mutex = slot->latch;
fprintf(stderr, fprintf(stderr,
"InnoDB error: sync levels should be" "InnoDB: sync levels should be"
" > %lu but a level is %lu\n", " > %lu but a level is %lu\n",
(ulong) limit, (ulong) slot->level); (ulong) limit, (ulong) slot->level);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment