diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-28 19:26:00 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-28 19:26:00 +0200 |
| commit | 0d5adca0de0a51b1f0bd49045fc4062eac7d1d25 (patch) | |
| tree | 3cb7a294c5feebb813cf73b248c53d026aa11602 /sql/slave.cc | |
| parent | 20e706689df1eb87c696304797e9d6184c0a75bb (diff) | |
| download | mariadb-git-0d5adca0de0a51b1f0bd49045fc4062eac7d1d25.tar.gz | |
debug_sync is now a service, available to dynamically loaded plugins.
new make target - abi_update
libservices/HOWTO:
remove references to Makefile.am
small tweaks
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index cf550ac22e3..ac7c9cd8c9e 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1339,7 +1339,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi) const char act[]= "now " "wait_for signal.get_unix_timestamp"; - DBUG_ASSERT(opt_debug_sync_timeout > 0); + DBUG_ASSERT(debug_sync_service); DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act))); };); @@ -1389,7 +1389,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi) const char act[]= "now " "wait_for signal.get_server_id"; - DBUG_ASSERT(opt_debug_sync_timeout > 0); + DBUG_ASSERT(debug_sync_service); DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act))); };); @@ -3034,7 +3034,7 @@ connected: const char act[]= "now " "wait_for signal.io_thread_let_running"; - DBUG_ASSERT(opt_debug_sync_timeout > 0); + DBUG_ASSERT(debug_sync_service); DBUG_ASSERT(!debug_sync_set_action(thd, STRING_WITH_LEN(act))); };); |