diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-03-01 14:58:19 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-03-01 14:58:19 +0100 |
| commit | 492c3b09d2b3c11ebb043276ff4b245d54d99fd0 (patch) | |
| tree | d4708d6fb9363c599083034107d01a3155eb41d0 | |
| parent | 1a998ee23980bac0e7985a66763a4ed044356257 (diff) | |
| download | mariadb-git-492c3b09d2b3c11ebb043276ff4b245d54d99fd0.tar.gz | |
Fix compile error when building with DBUG, but without DEBUG_SYNC.
| -rw-r--r-- | sql/slave.cc | 6 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 2 | ||||
| -rw-r--r-- | sql/sql_repl.cc | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 7b7fd12e267..16ef754c058 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1334,6 +1334,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi) unavailable (very old master not supporting UNIX_TIMESTAMP()?). */ +#ifdef ENABLED_DEBUG_SYNC DBUG_EXECUTE_IF("dbug.before_get_UNIX_TIMESTAMP", { const char act[]= @@ -1343,6 +1344,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi) DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act))); };); +#endif master_res= NULL; if (!mysql_real_query(mysql, STRING_WITH_LEN("SELECT UNIX_TIMESTAMP()")) && @@ -1384,6 +1386,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi) Note: we could have put a @@SERVER_ID in the previous SELECT UNIX_TIMESTAMP() instead, but this would not have worked on 3.23 masters. */ +#ifdef ENABLED_DEBUG_SYNC DBUG_EXECUTE_IF("dbug.before_get_SERVER_ID", { const char act[]= @@ -1393,6 +1396,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi) DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act))); };); +#endif master_res= NULL; master_row= NULL; if (!mysql_real_query(mysql, @@ -3081,6 +3085,7 @@ pthread_handler_t handle_slave_io(void *arg) connected: +#ifdef ENABLED_DEBUG_SYNC DBUG_EXECUTE_IF("dbug.before_get_running_status_yes", { const char act[]= @@ -3090,6 +3095,7 @@ connected: DBUG_ASSERT(!debug_sync_set_action(thd, STRING_WITH_LEN(act))); };); +#endif // TODO: the assignment below should be under mutex (5.0) mi->slave_running= MYSQL_SLAVE_RUN_CONNECT; diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 6ea0dcbeb8e..808214402ff 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2944,6 +2944,7 @@ end_with_restore_list: thd->first_successful_insert_id_in_cur_stmt= thd->first_successful_insert_id_in_prev_stmt; +#ifdef ENABLED_DEBUG_SYNC DBUG_EXECUTE_IF("after_mysql_insert", { const char act1[]= @@ -2959,6 +2960,7 @@ end_with_restore_list: STRING_WITH_LEN(act2))); };); DEBUG_SYNC(thd, "after_mysql_insert"); +#endif break; } case SQLCOM_REPLACE_SELECT: diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 57820784b8d..4e5eef14d69 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -897,6 +897,7 @@ impossible position"; event_type= (Log_event_type)((uchar)(*packet)[LOG_EVENT_OFFSET+ev_offset]); +#ifdef ENABLED_DEBUG_SYNC DBUG_EXECUTE_IF("dump_thread_wait_before_send_xid", { if (event_type == XID_EVENT) @@ -915,6 +916,7 @@ impossible position"; STRING_WITH_LEN(act2))); } }); +#endif if (event_type == FORMAT_DESCRIPTION_EVENT) { current_checksum_alg= get_checksum_alg(packet->ptr() + ev_offset, |