diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-08-02 19:05:48 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-08-03 12:22:35 +0300 |
| commit | 13e4bf674e26065cefce6746c7c52afdad5ce8ad (patch) | |
| tree | aa1184151e3979321052912053290e20de9e8c71 | |
| parent | 40e213f21040cef848f1a40fdaec23dacd1a4f7d (diff) | |
| download | mariadb-git-13e4bf674e26065cefce6746c7c52afdad5ce8ad.tar.gz | |
Fix tokudb compilation post merge
| -rw-r--r-- | storage/tokudb/PerconaFT/portability/toku_debug_sync.h | 2 | ||||
| -rw-r--r-- | storage/tokudb/PerconaFT/tools/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/tokudb/hatoku_hton.cc | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/storage/tokudb/PerconaFT/portability/toku_debug_sync.h b/storage/tokudb/PerconaFT/portability/toku_debug_sync.h index 4a959cab1fe..b5394e58d68 100644 --- a/storage/tokudb/PerconaFT/portability/toku_debug_sync.h +++ b/storage/tokudb/PerconaFT/portability/toku_debug_sync.h @@ -67,7 +67,7 @@ inline void toku_debug_sync(struct tokutxn *txn, const char *sync_point_name) { toku_txn_get_client_id(txn, &client_id, &client_extra); thd = reinterpret_cast<THD *>(client_extra); - debug_sync(thd, sync_point_name, strlen(sync_point_name)); + DEBUG_SYNC(thd, sync_point_name); } #else // defined(ENABLED_DEBUG_SYNC) diff --git a/storage/tokudb/PerconaFT/tools/CMakeLists.txt b/storage/tokudb/PerconaFT/tools/CMakeLists.txt index daaff5eb379..e6540bf69be 100644 --- a/storage/tokudb/PerconaFT/tools/CMakeLists.txt +++ b/storage/tokudb/PerconaFT/tools/CMakeLists.txt @@ -10,7 +10,7 @@ foreach(tool ${tools}) if (DEFINED MYSQL_PROJECT_NAME_DOCSTRING) if ((CMAKE_BUILD_TYPE MATCHES "Debug") AND (CMAKE_CXX_FLAGS_DEBUG MATCHES " -DENABLED_DEBUG_SYNC")) - target_link_libraries(${tool} sql binlog rpl master slave) + target_link_libraries(${tool} sql) endif() endif () diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc index e0f92b17fce..76ce6bec0fc 100644 --- a/storage/tokudb/hatoku_hton.cc +++ b/storage/tokudb/hatoku_hton.cc @@ -55,7 +55,7 @@ static bool tokudb_show_status( static void tokudb_handle_fatal_signal(handlerton* hton, THD* thd, int sig); #endif static int tokudb_close_connection(handlerton* hton, THD* thd); -static void tokudb_kill_connection(handlerton *hton, THD *thd); +static void tokudb_kill_connection(handlerton *hton, THD *thd, enum thd_kill_levels level); static int tokudb_commit(handlerton* hton, THD* thd, bool all); static int tokudb_rollback(handlerton* hton, THD* thd, bool all); #if TOKU_INCLUDE_XA @@ -332,7 +332,7 @@ static int tokudb_init_func(void *p) { tokudb_hton->create = tokudb_create_handler; tokudb_hton->close_connection = tokudb_close_connection; - tokudb_hton->kill_connection = tokudb_kill_connection; + tokudb_hton->kill_query = tokudb_kill_connection; tokudb_hton->savepoint_offset = sizeof(SP_INFO_T); tokudb_hton->savepoint_set = tokudb_savepoint; @@ -756,7 +756,8 @@ static int tokudb_close_connection(handlerton* hton, THD* thd) { return error; } -void tokudb_kill_connection(handlerton *hton, THD *thd) { +void tokudb_kill_connection(handlerton *hton, THD *thd, + enum thd_kill_levels level) { TOKUDB_DBUG_ENTER(""); db_env->kill_waiter(db_env, thd); DBUG_VOID_RETURN; |