Commit fe3a00a6 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:2039], propogate show engine error

git-svn-id: file:///svn/mysql/tokudb-engine/src@14806 c7de825b-a66e-492c-adef-691d508d4ae1
parent e984ceb3
...@@ -678,6 +678,7 @@ cleanup: ...@@ -678,6 +678,7 @@ cleanup:
sql_print_error("got an error %d in show_data_size\n", error); sql_print_error("got an error %d in show_data_size\n", error);
} }
pthread_mutex_unlock(&tokudb_meta_mutex); pthread_mutex_unlock(&tokudb_meta_mutex);
if (error) { my_errno = error; }
TOKUDB_DBUG_RETURN(error); TOKUDB_DBUG_RETURN(error);
} }
...@@ -721,6 +722,7 @@ static bool tokudb_show_logs(THD * thd, stat_print_fn * stat_print) { ...@@ -721,6 +722,7 @@ static bool tokudb_show_logs(THD * thd, stat_print_fn * stat_print) {
free(free_logs); free(free_logs);
free_root(&show_logs_root, MYF(0)); free_root(&show_logs_root, MYF(0));
*root_ptr = old_mem_root; *root_ptr = old_mem_root;
if (error) { my_errno = error; }
TOKUDB_DBUG_RETURN(error); TOKUDB_DBUG_RETURN(error);
} }
...@@ -791,6 +793,7 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) { ...@@ -791,6 +793,7 @@ static bool tokudb_show_engine_status(THD * thd, stat_print_fn * stat_print) {
} }
if (error) { my_errno = error; }
TOKUDB_DBUG_RETURN(error); TOKUDB_DBUG_RETURN(error);
} }
......
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