diff options
| author | Rich Prohaska <prohaska@tokutek.com> | 2013-09-20 09:53:15 -0400 |
|---|---|---|
| committer | Rich Prohaska <prohaska@tokutek.com> | 2013-09-20 09:53:15 -0400 |
| commit | 9c47f41e3b1a7ef23abb6106df6d234a0504beb9 (patch) | |
| tree | 034699724b17b953e3a7368759d2e42d65b00fc2 /storage | |
| parent | 88ca814b3e785f9dce007702663e7a9e70b53ebf (diff) | |
| download | mariadb-git-9c47f41e3b1a7ef23abb6106df6d234a0504beb9.tar.gz | |
#81 cleanup thread variables a bit
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/tokudb/ha_tokudb_update.cc | 4 | ||||
| -rw-r--r-- | storage/tokudb/hatoku_hton.h | 15 |
2 files changed, 2 insertions, 17 deletions
diff --git a/storage/tokudb/ha_tokudb_update.cc b/storage/tokudb/ha_tokudb_update.cc index 51a0bf5f35f..fea5a571bd4 100644 --- a/storage/tokudb/ha_tokudb_update.cc +++ b/storage/tokudb/ha_tokudb_update.cc @@ -279,7 +279,7 @@ int ha_tokudb::fast_update(THD *thd, List<Item> &update_fields, List<Item> &upda check_error: if (error != 0) { - if (get_disable_slow_update(thd)) + if (THDVAR(thd, disable_slow_update) != 0) error = HA_ERR_UNSUPPORTED; if (error != ENOTSUP) print_error(error, MYF(0)); @@ -882,7 +882,7 @@ int ha_tokudb::upsert(THD *thd, List<Item> &update_fields, List<Item> &update_va check_error: if (error != 0) { - if (get_disable_slow_upsert(thd)) + if (THDVAR(thd, disable_slow_upsert) != 0) error = HA_ERR_UNSUPPORTED; if (error != ENOTSUP) print_error(error, MYF(0)); diff --git a/storage/tokudb/hatoku_hton.h b/storage/tokudb/hatoku_hton.h index dc3d68443fd..bc4c7a11e03 100644 --- a/storage/tokudb/hatoku_hton.h +++ b/storage/tokudb/hatoku_hton.h @@ -133,7 +133,6 @@ static uint get_pk_insert_mode(THD* thd) { return THDVAR(thd, pk_insert_mode); } - static MYSQL_THDVAR_BOOL(load_save_space, 0, "if on, intial loads are slower but take less space", @@ -260,10 +259,6 @@ static MYSQL_THDVAR_BOOL(disable_slow_update, false // default ); -static bool get_disable_slow_update(THD *thd) { - return (THDVAR(thd, disable_slow_update) != 0); -} - static MYSQL_THDVAR_BOOL(disable_slow_upsert, PLUGIN_VAR_THDLOCAL, "disable slow upsert", @@ -271,10 +266,6 @@ static MYSQL_THDVAR_BOOL(disable_slow_upsert, NULL, // update false // default ); - -static bool get_disable_slow_upsert(THD *thd) { - return (THDVAR(thd, disable_slow_upsert) != 0); -} #endif static MYSQL_THDVAR_UINT(analyze_time, @@ -348,12 +339,6 @@ static MYSQL_THDVAR_UINT(lock_timeout_debug, 0, "TokuDB lock timeout debug", NUL static MYSQL_THDVAR_STR(last_lock_timeout, PLUGIN_VAR_MEMALLOC, "last TokuDB lock timeout", NULL, NULL, NULL); - - - - - - extern HASH tokudb_open_tables; extern pthread_mutex_t tokudb_mutex; extern pthread_mutex_t tokudb_meta_mutex; |