diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-06-05 11:43:05 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-06-09 13:38:29 -0400 |
| commit | f965cae5fb04a9fd06a939a8f2b52228a62ce9fa (patch) | |
| tree | 93dd6732d4fe712ad7c937028719de88f48f9e2d /mysql-test/suite/rpl | |
| parent | c94789c3d38831fb7ad0781b97b28abb8a17a165 (diff) | |
| download | mariadb-git-f965cae5fb04a9fd06a939a8f2b52228a62ce9fa.tar.gz | |
MDEV-7110 : Add missing MySQL variable log_bin_basename and log_bin_index
Add log_bin_index, log_bin_basename and relay_log_basename system
variables. Also, convert relay_log_index system variable to
NO_CMD_LINE and implement --relay-log-index as a command line
option.
Diffstat (limited to 'mysql-test/suite/rpl')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_flushlog_loop.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_variables.result | 28 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_variables.test | 24 |
3 files changed, 54 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result index 7b93a221953..a5bf73cdbfa 100644 --- a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result +++ b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result @@ -2,7 +2,8 @@ include/rpl_init.inc [topology=1->2->1] show variables like 'relay_log%'; Variable_name Value relay_log master-relay-bin -relay_log_index master-relay-bin.index +relay_log_basename MYSQLD_DATADIR/master-relay-bin +relay_log_index MYSQLD_DATADIR/master-relay-bin.index relay_log_info_file relay-log.info relay_log_purge ON relay_log_recovery OFF diff --git a/mysql-test/suite/rpl/r/rpl_variables.result b/mysql-test/suite/rpl/r/rpl_variables.result index 8711dce4ab6..f91cdad6e47 100644 --- a/mysql-test/suite/rpl/r/rpl_variables.result +++ b/mysql-test/suite/rpl/r/rpl_variables.result @@ -38,6 +38,34 @@ include/stop_slave.inc include/start_slave.inc SET @@global.init_slave = 'SELECT 1'; [on master] +SELECT @@pid_file, @@datadir; +@@pid_file MYSQLTEST_VARDIR/run/mysqld.1.pid +@@datadir MYSQLTEST_VARDIR/mysqld.1/data/ +**** Relay log variables +SELECT @@relay_log, @@relay_log_index, @@relay_log_basename; +@@relay_log master-relay-bin +@@relay_log_index MYSQLTEST_VARDIR/mysqld.1/data/master-relay-bin.index +@@relay_log_basename MYSQLTEST_VARDIR/mysqld.1/data/master-relay-bin +**** Binary log variables +SELECT @@log_bin, @@log_bin_index, @@log_bin_basename; +@@log_bin 1 +@@log_bin_index MYSQLTEST_VARDIR/mysqld.1/data/master-bin.index +@@log_bin_basename MYSQLTEST_VARDIR/mysqld.1/data/master-bin +[on slave] +SELECT @@pid_file, @@datadir; +@@pid_file MYSQLTEST_VARDIR/run/mysqld.2.pid +@@datadir MYSQLTEST_VARDIR/mysqld.2/data/ +**** Relay log variables +SELECT @@relay_log, @@relay_log_index, @@relay_log_basename; +@@relay_log slave-relay-bin +@@relay_log_index MYSQLTEST_VARDIR/mysqld.2/data/slave-relay-bin.index +@@relay_log_basename MYSQLTEST_VARDIR/mysqld.2/data/slave-relay-bin +**** Binary log variables +SELECT @@log_bin, @@log_bin_index, @@log_bin_basename; +@@log_bin 1 +@@log_bin_index MYSQLTEST_VARDIR/mysqld.2/data/slave-bin.index +@@log_bin_basename MYSQLTEST_VARDIR/mysqld.2/data/slave-bin +[on master] CREATE TABLE tstmt (id INT AUTO_INCREMENT PRIMARY KEY, truth BOOLEAN, num INT, diff --git a/mysql-test/suite/rpl/t/rpl_variables.test b/mysql-test/suite/rpl/t/rpl_variables.test index ca90054da2a..246e595d265 100644 --- a/mysql-test/suite/rpl/t/rpl_variables.test +++ b/mysql-test/suite/rpl/t/rpl_variables.test @@ -119,6 +119,30 @@ SET @@global.init_slave = 'SELECT 1'; --echo [on master] connection master; +# checking values of read-only variables +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +query_vertical SELECT @@pid_file, @@datadir; +--echo **** Relay log variables +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +query_vertical SELECT @@relay_log, @@relay_log_index, @@relay_log_basename; +--echo **** Binary log variables +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +query_vertical SELECT @@log_bin, @@log_bin_index, @@log_bin_basename; + +--echo [on slave] +connection slave; +# checking values of read-only variables +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +query_vertical SELECT @@pid_file, @@datadir; +--echo **** Relay log variables +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +query_vertical SELECT @@relay_log, @@relay_log_index, @@relay_log_basename; +--echo **** Binary log variables +--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR +query_vertical SELECT @@log_bin, @@log_bin_index, @@log_bin_basename; + +--echo [on master] +connection master; # Tables where everything happens. CREATE TABLE tstmt (id INT AUTO_INCREMENT PRIMARY KEY, |