Commit 20d78170 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:3041], partial fix, error message improved, but still not perfect, will...

[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
parent b7e19f23
...@@ -329,7 +329,7 @@ int ai_poll_fun(void *extra, float progress) { ...@@ -329,7 +329,7 @@ int ai_poll_fun(void *extra, float progress) {
LOADER_CONTEXT context = (LOADER_CONTEXT)extra; LOADER_CONTEXT context = (LOADER_CONTEXT)extra;
if (context->thd->killed) { if (context->thd->killed) {
sprintf(context->write_status_msg, "The process has been killed, aborting add index."); 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); sprintf(context->write_status_msg, "Adding of indexes about %.1f%% done", progress*100);
thd_proc_info(context->thd, context->write_status_msg); thd_proc_info(context->thd, context->write_status_msg);
...@@ -340,7 +340,7 @@ int poll_fun(void *extra, float progress) { ...@@ -340,7 +340,7 @@ int poll_fun(void *extra, float progress) {
LOADER_CONTEXT context = (LOADER_CONTEXT)extra; LOADER_CONTEXT context = (LOADER_CONTEXT)extra;
if (context->thd->killed) { if (context->thd->killed) {
sprintf(context->write_status_msg, "The process has been killed, aborting bulk load."); 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); sprintf(context->write_status_msg, "Loading of data about %.1f%% done", progress*100);
thd_proc_info(context->thd, context->write_status_msg); thd_proc_info(context->thd, context->write_status_msg);
......
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