|
|
|
@ -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; |
|
|
|
|