database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix compile error when building with DBUG, but without DEBUG_SYNC.

Browse Source
This commit is contained in:
unknown
2013-03-01 14:58:19 +01:00
parent 1a998ee239
commit 492c3b09d2
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/slave.cc
View File

@ -1334,6 +1334,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
unavailable (very old master not supporting UNIX_TIMESTAMP()?). unavailable (very old master not supporting UNIX_TIMESTAMP()?).
*/ */
#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("dbug.before_get_UNIX_TIMESTAMP", DBUG_EXECUTE_IF("dbug.before_get_UNIX_TIMESTAMP",
{ {
const char act[]= 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, DBUG_ASSERT(!debug_sync_set_action(current_thd,
STRING_WITH_LEN(act))); STRING_WITH_LEN(act)));
};); };);
#endif
master_res= NULL; master_res= NULL;
if (!mysql_real_query(mysql, STRING_WITH_LEN("SELECT UNIX_TIMESTAMP()")) && 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 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. 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", DBUG_EXECUTE_IF("dbug.before_get_SERVER_ID",
{ {
const char act[]= 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, DBUG_ASSERT(!debug_sync_set_action(current_thd,
STRING_WITH_LEN(act))); STRING_WITH_LEN(act)));
};); };);
#endif
master_res= NULL; master_res= NULL;
master_row= NULL; master_row= NULL;
if (!mysql_real_query(mysql, if (!mysql_real_query(mysql,
@ -3081,6 +3085,7 @@ pthread_handler_t handle_slave_io(void *arg)
connected: connected:
#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("dbug.before_get_running_status_yes", DBUG_EXECUTE_IF("dbug.before_get_running_status_yes",
{ {
const char act[]= const char act[]=
@ -3090,6 +3095,7 @@ connected:
DBUG_ASSERT(!debug_sync_set_action(thd, DBUG_ASSERT(!debug_sync_set_action(thd,
STRING_WITH_LEN(act))); STRING_WITH_LEN(act)));
};); };);
#endif
// TODO: the assignment below should be under mutex (5.0) // TODO: the assignment below should be under mutex (5.0)
mi->slave_running= MYSQL_SLAVE_RUN_CONNECT; mi->slave_running= MYSQL_SLAVE_RUN_CONNECT;

2
sql/sql_parse.cc
View File

@ -2944,6 +2944,7 @@ end_with_restore_list:
thd->first_successful_insert_id_in_cur_stmt= thd->first_successful_insert_id_in_cur_stmt=
thd->first_successful_insert_id_in_prev_stmt; thd->first_successful_insert_id_in_prev_stmt;
#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("after_mysql_insert", DBUG_EXECUTE_IF("after_mysql_insert",
{ {
const char act1[]= const char act1[]=
@ -2959,6 +2960,7 @@ end_with_restore_list:
STRING_WITH_LEN(act2))); STRING_WITH_LEN(act2)));
};); };);
DEBUG_SYNC(thd, "after_mysql_insert"); DEBUG_SYNC(thd, "after_mysql_insert");
#endif
break; break;
} }
case SQLCOM_REPLACE_SELECT: case SQLCOM_REPLACE_SELECT:

2
sql/sql_repl.cc
View File

@ -897,6 +897,7 @@ impossible position";
event_type= event_type=
(Log_event_type)((uchar)(*packet)[LOG_EVENT_OFFSET+ev_offset]); (Log_event_type)((uchar)(*packet)[LOG_EVENT_OFFSET+ev_offset]);
#ifdef ENABLED_DEBUG_SYNC
DBUG_EXECUTE_IF("dump_thread_wait_before_send_xid", DBUG_EXECUTE_IF("dump_thread_wait_before_send_xid",
{ {
if (event_type == XID_EVENT) if (event_type == XID_EVENT)
@ -915,6 +916,7 @@ impossible position";
STRING_WITH_LEN(act2))); STRING_WITH_LEN(act2)));
} }
}); });
#endif
if (event_type == FORMAT_DESCRIPTION_EVENT) if (event_type == FORMAT_DESCRIPTION_EVENT)
{ {
current_checksum_alg= get_checksum_alg(packet->ptr() + ev_offset, current_checksum_alg= get_checksum_alg(packet->ptr() + ev_offset,