mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[t:3041], partial fix, error message improved, but still not perfect, will probably delay finishing this ticket til post 5.0

Browse source 
git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@25841 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Zardosht Kasheff 2013-04-17 00:02:03 -04:00 committed by Yoni Fogel
parent b7e19f235a
commit 20d7817076
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/tokudb/ha_tokudb.cc
View file

@ -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) {
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);