diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-08-21 23:16:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-04 10:33:53 +0200 |
| commit | 8aa473c4b9957c7c365cf50ade520ff397d6afb1 (patch) | |
| tree | cad39bd069c653dcd6f89c80bd95a1146f5bbc27 /mysql-test/include | |
| parent | 274a47a50be586b72e1954a1cb3bc6fba402baa2 (diff) | |
| download | mariadb-git-8aa473c4b9957c7c365cf50ade520ff397d6afb1.tar.gz | |
fix show_relaylog_events.inc to work for multisource
and fix SHOW RELAYLOG 'src_name' EVENTS to respect src_name
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/show_events.inc | 16 | ||||
| -rw-r--r-- | mysql-test/include/show_relaylog_events.inc | 3 |
2 files changed, 16 insertions, 3 deletions
diff --git a/mysql-test/include/show_events.inc b/mysql-test/include/show_events.inc index 7917b6740cf..368cfc9e3a7 100644 --- a/mysql-test/include/show_events.inc +++ b/mysql-test/include/show_events.inc @@ -15,7 +15,19 @@ --let $statement=show BINLOG events if ($is_relay_log) { - --let $statement=show relaylog events + if ($master_name) + { + let _master_name='$master_name'; + } + if (!$master_name) + { + let _master_name=`select @@default_master_connection`; + if ($_master_name) + { + let _master_name='$_master_name'; + } + } + --let $statement=show relaylog $_master_name events } if ($binlog_file) @@ -25,7 +37,7 @@ if ($binlog_file) { if ($is_relay_log) { - --let $_binlog_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1) + --let $_binlog_file= query_get_value(SHOW SLAVE $_master_name STATUS, Relay_Log_File, 1) } if (!$is_relay_log) { diff --git a/mysql-test/include/show_relaylog_events.inc b/mysql-test/include/show_relaylog_events.inc index d1bd11f1642..c98e961da76 100644 --- a/mysql-test/include/show_relaylog_events.inc +++ b/mysql-test/include/show_relaylog_events.inc @@ -1,10 +1,11 @@ ############################################################################## # Show relay log events # -# Useage: +# Usage: # let $binlog_file= slave-relay-bin.000002; # let $binlog_start= 106; # let $binlog_limit= 1, 3; +# let $master_name= master1; # source include/show_relaylog_events.inc; # # It shows the first relay log file if $binlog_file is not given. |