Commit 66e73768 authored by unknown's avatar unknown

WL2826: Error handling of ALTER TABLE for partitioning

Actual error reported in my_errno from my_delete


sql/sql_table.cc:
  Actual error reported in my_errno from my_delete
parent 319c5da1
...@@ -550,13 +550,13 @@ static bool init_ddl_log() ...@@ -550,13 +550,13 @@ static bool init_ddl_log()
FALSE Success FALSE Success
*/ */
static bool execute_ddl_log_action(THD *thd, DDL_LOG_ENTRY *ddl_log_entry) static int execute_ddl_log_action(THD *thd, DDL_LOG_ENTRY *ddl_log_entry)
{ {
bool frm_action= FALSE; bool frm_action= FALSE;
LEX_STRING handler_name; LEX_STRING handler_name;
handler *file= NULL; handler *file= NULL;
MEM_ROOT mem_root; MEM_ROOT mem_root;
bool error= TRUE; int error= TRUE;
char to_path[FN_REFLEN]; char to_path[FN_REFLEN];
char from_path[FN_REFLEN]; char from_path[FN_REFLEN];
char *par_ext= (char*)".par"; char *par_ext= (char*)".par";
...@@ -602,7 +602,7 @@ static bool execute_ddl_log_action(THD *thd, DDL_LOG_ENTRY *ddl_log_entry) ...@@ -602,7 +602,7 @@ static bool execute_ddl_log_action(THD *thd, DDL_LOG_ENTRY *ddl_log_entry)
strxmov(to_path, ddl_log_entry->name, reg_ext, NullS); strxmov(to_path, ddl_log_entry->name, reg_ext, NullS);
if ((error= my_delete(to_path, MYF(MY_WME)))) if ((error= my_delete(to_path, MYF(MY_WME))))
{ {
if (error != ENOENT) if (my_errno != ENOENT)
break; break;
} }
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
......
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