Commit 4d263c49 authored by unknown's avatar unknown

Bug #27173: "Enabling keys got errno ..." does not say which table

Warnings may show up in the error log that complain about a table, yet
don't tell us which table.

Add the database and table names to the message.


sql/ha_myisam.cc:
  Add the database and table names to the warning message.
parent c004ad09
...@@ -882,8 +882,8 @@ int ha_myisam::optimize(THD* thd, HA_CHECK_OPT *check_opt) ...@@ -882,8 +882,8 @@ int ha_myisam::optimize(THD* thd, HA_CHECK_OPT *check_opt)
param.sort_buffer_length= check_opt->sort_buffer_size; param.sort_buffer_length= check_opt->sort_buffer_size;
if ((error= repair(thd,param,1)) && param.retry_repair) if ((error= repair(thd,param,1)) && param.retry_repair)
{ {
sql_print_warning("Warning: Optimize table got errno %d, retrying", sql_print_warning("Warning: Optimize table got errno %d on %s.%s, retrying",
my_errno); my_errno, param.db_name, param.table_name);
param.testflag&= ~T_REP_BY_SORT; param.testflag&= ~T_REP_BY_SORT;
error= repair(thd,param,1); error= repair(thd,param,1);
} }
...@@ -1273,8 +1273,8 @@ int ha_myisam::enable_indexes(uint mode) ...@@ -1273,8 +1273,8 @@ int ha_myisam::enable_indexes(uint mode)
param.tmpdir=&mysql_tmpdir_list; param.tmpdir=&mysql_tmpdir_list;
if ((error= (repair(thd,param,0) != HA_ADMIN_OK)) && param.retry_repair) if ((error= (repair(thd,param,0) != HA_ADMIN_OK)) && param.retry_repair)
{ {
sql_print_warning("Warning: Enabling keys got errno %d, retrying", sql_print_warning("Warning: Enabling keys got errno %d on %s.%s, retrying",
my_errno); my_errno, param.db_name, param.table_name);
param.testflag&= ~(T_REP_BY_SORT | T_QUICK); param.testflag&= ~(T_REP_BY_SORT | T_QUICK);
error= (repair(thd,param,0) != HA_ADMIN_OK); error= (repair(thd,param,0) != HA_ADMIN_OK);
} }
......
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