From 20d7817076067fccfb3ec1b381f2c9b648af9ca6 Mon Sep 17 00:00:00 2001 From: Zardosht Kasheff Date: Wed, 17 Apr 2013 00:02:03 -0400 Subject: [PATCH] [t:3041], partial fix, error message improved, but still not perfect, will probably delay finishing this ticket til post 5.0 git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@25841 c7de825b-a66e-492c-adef-691d508d4ae1 --- storage/tokudb/ha_tokudb.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index 64a946fcc11..ab73d0747e5 100644 --- a/storage/tokudb/ha_tokudb.cc +++ b/storage/tokudb/ha_tokudb.cc @@ -329,7 +329,7 @@ int ai_poll_fun(void *extra, float progress) { LOADER_CONTEXT context = (LOADER_CONTEXT)extra; if (context->thd->killed) { sprintf(context->write_status_msg, "The process has been killed, aborting add index."); - return 1; + return ER_ABORTING_CONNECTION; } sprintf(context->write_status_msg, "Adding of indexes about %.1f%% done", progress*100); thd_proc_info(context->thd, context->write_status_msg); @@ -340,7 +340,7 @@ int poll_fun(void *extra, float progress) { LOADER_CONTEXT context = (LOADER_CONTEXT)extra; if (context->thd->killed) { sprintf(context->write_status_msg, "The process has been killed, aborting bulk load."); - return 1; + return ER_ABORTING_CONNECTION; } sprintf(context->write_status_msg, "Loading of data about %.1f%% done", progress*100); thd_proc_info(context->thd, context->write_status_msg);