diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
| commit | cd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch) | |
| tree | 95bf82d0e0522c6af708cd28639c82e004b5a264 /mysql-test/include/rpl_sync.inc | |
| parent | f884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff) | |
| parent | d516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff) | |
| download | mariadb-git-10.2-connector-c-integ.tar.gz | |
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'mysql-test/include/rpl_sync.inc')
| -rw-r--r-- | mysql-test/include/rpl_sync.inc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/include/rpl_sync.inc b/mysql-test/include/rpl_sync.inc index be2904528ff..83d4a2e4628 100644 --- a/mysql-test/include/rpl_sync.inc +++ b/mysql-test/include/rpl_sync.inc @@ -81,7 +81,9 @@ while ($_rpl_i) { } if ($rpl_only_running_threads) { + disable_connect_log; --connection server_$_rpl_server + enable_connect_log; --let $_rpl_slave_io_running= query_get_value(SHOW SLAVE STATUS, Slave_IO_Running, 1) --let $_rpl_slave_sql_running= query_get_value(SHOW SLAVE STATUS, Slave_SQL_Running, 1) if ($rpl_debug) @@ -92,7 +94,9 @@ while ($_rpl_i) { --let $_rpl_slave_sql_running= `SELECT IF('$_rpl_slave_sql_running' = 'Yes', 1, '')` if ($_rpl_slave_io_running) { + disable_query_log; --connection server_$_rpl_prev_server + enable_query_log; if ($_rpl_slave_sql_running) { if ($rpl_debug) @@ -101,7 +105,9 @@ while ($_rpl_i) { --let $_rpl_master_pos= query_get_value("SHOW MASTER STATUS", Position, 1) --echo syncing master_file='$_rpl_master_file' master_pos='$_rpl_master_pos' } + disable_connect_log; --sync_slave_with_master server_$_rpl_server + enable_connect_log; } if (!$_rpl_slave_sql_running) { @@ -119,6 +125,7 @@ while ($_rpl_i) { } if (!$rpl_only_running_threads) { + disable_connect_log; --connection server_$_rpl_prev_server if ($rpl_debug) { @@ -127,6 +134,7 @@ while ($_rpl_i) { --echo syncing master_file='$_rpl_master_file' master_pos='$_rpl_master_pos' } --sync_slave_with_master server_$_rpl_server + enable_connect_log; } } |