From 66e73768cf9d75c47ec6f8cb17226d213724fa7a Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 19 Apr 2006 20:57:42 -0400 Subject: [PATCH] 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 --- sql/sql_table.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 09a54a14b91..17d3fa909d5 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -550,13 +550,13 @@ static bool init_ddl_log() 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; LEX_STRING handler_name; handler *file= NULL; MEM_ROOT mem_root; - bool error= TRUE; + int error= TRUE; char to_path[FN_REFLEN]; char from_path[FN_REFLEN]; char *par_ext= (char*)".par"; @@ -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); if ((error= my_delete(to_path, MYF(MY_WME)))) { - if (error != ENOENT) + if (my_errno != ENOENT) break; } #ifdef WITH_PARTITION_STORAGE_ENGINE