diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2014-10-03 15:41:54 -0400 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2014-10-03 15:41:54 -0400 |
| commit | 768b13d5c1c1df29a1bbeddd7de5a95cb3b2b91e (patch) | |
| tree | 20a614f2eb9a0409a4c6e1e1198c2c9e651695f3 /storage/tokudb/ha_tokudb.cc | |
| parent | dcda78e71f5c46e4891b1f91ba060e377e3f99c7 (diff) | |
| download | mariadb-git-768b13d5c1c1df29a1bbeddd7de5a95cb3b2b91e.tar.gz | |
DB-735 use thd_killed
Diffstat (limited to 'storage/tokudb/ha_tokudb.cc')
| -rw-r--r-- | storage/tokudb/ha_tokudb.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index d472f1259e0..d9b11dbba3e 100644 --- a/storage/tokudb/ha_tokudb.cc +++ b/storage/tokudb/ha_tokudb.cc @@ -471,7 +471,7 @@ typedef struct index_read_info { static int ai_poll_fun(void *extra, float progress) { LOADER_CONTEXT context = (LOADER_CONTEXT)extra; - if (context->thd->killed) { + if (thd_killed(context->thd)) { sprintf(context->write_status_msg, "The process has been killed, aborting add index."); return ER_ABORTING_CONNECTION; } @@ -486,7 +486,7 @@ static int ai_poll_fun(void *extra, float progress) { static int loader_poll_fun(void *extra, float progress) { LOADER_CONTEXT context = (LOADER_CONTEXT)extra; - if (context->thd->killed) { + if (thd_killed(context->thd)) { sprintf(context->write_status_msg, "The process has been killed, aborting bulk load."); return ER_ABORTING_CONNECTION; } @@ -3316,7 +3316,7 @@ int ha_tokudb::end_bulk_insert(bool abort) { ai_metadata_update_required = false; loader_error = 0; if (loader) { - if (!abort_loader && !thd->killed) { + if (!abort_loader && !thd_killed(thd)) { DBUG_EXECUTE_IF("tokudb_end_bulk_insert_sleep", { const char *orig_proc_info = tokudb_thd_get_proc_info(thd); thd_proc_info(thd, "DBUG sleep"); @@ -3326,7 +3326,7 @@ int ha_tokudb::end_bulk_insert(bool abort) { error = loader->close(loader); loader = NULL; if (error) { - if (thd->killed) { + if (thd_killed(thd)) { my_error(ER_QUERY_INTERRUPTED, MYF(0)); } goto cleanup; @@ -3461,7 +3461,7 @@ int ha_tokudb::is_index_unique(bool* is_unique, DB_TXN* txn, DB* db, KEY* key_in share->rows, key_info->name); thd_proc_info(thd, status_msg); - if (thd->killed) { + if (thd_killed(thd)) { my_error(ER_QUERY_INTERRUPTED, MYF(0)); error = ER_QUERY_INTERRUPTED; goto cleanup; @@ -7712,7 +7712,7 @@ int ha_tokudb::tokudb_add_index( thd_progress_report(thd, num_processed, (long long unsigned) share->rows); #endif - if (thd->killed) { + if (thd_killed(thd)) { error = ER_ABORTING_CONNECTION; goto cleanup; } |