summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorsasha@mysql.sashanet.com <>2001-10-08 13:07:50 -0600
committersasha@mysql.sashanet.com <>2001-10-08 13:07:50 -0600
commitb13bd81cb1c4b05212a35529b107d7a3a00fc43c (patch)
tree1c426652ec0511155284e072dff0501b28bde18a /mysql-test
parenta169482a9bc4d10f7ef13a3da6bd032d23316b13 (diff)
downloadmariadb-git-b13bd81cb1c4b05212a35529b107d7a3a00fc43c.tar.gz
groundbreaking on fail-safe replication - added a token feature to have an
excuse to have a test case. Mental trick to get things moving faster...
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/mysql-test-run.sh6
-rw-r--r--mysql-test/r/rpl_failsafe.result11
-rw-r--r--mysql-test/t/rpl_failsafe.test5
3 files changed, 19 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 6acba819462..0a78842ac63 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -591,7 +591,7 @@ start_master()
if [ -z "$DO_BENCH" ]
then
master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin \
- --server-id=1 \
+ --server-id=1 --rpl-recovery-rank=1 \
--basedir=$MY_BASEDIR \
--port=$MASTER_MYPORT \
--exit-info=256 \
@@ -608,7 +608,7 @@ start_master()
$EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT"
else
master_args="--no-defaults --log-bin=$MYSQL_TEST_DIR/var/log/master-bin \
- --server-id=1 \
+ --server-id=1 --rpl-recovery-rank=1 \
--basedir=$MY_BASEDIR \
--port=$MASTER_MYPORT \
--datadir=$MASTER_MYDDIR \
@@ -663,7 +663,7 @@ start_slave()
--master-host=127.0.0.1 \
--master-password= \
--master-port=$MASTER_MYPORT \
- --server-id=2"
+ --server-id=2 --rpl-recovery-rank=2"
else
master_info=$SLAVE_MASTER_INFO
fi
diff --git a/mysql-test/r/rpl_failsafe.result b/mysql-test/r/rpl_failsafe.result
new file mode 100644
index 00000000000..789795c0343
--- /dev/null
+++ b/mysql-test/r/rpl_failsafe.result
@@ -0,0 +1,11 @@
+slave stop;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+slave start;
+show variables like 'rpl_recovery_rank';
+Variable_name Value
+rpl_recovery_rank 1
+show variables like 'rpl_recovery_rank';
+Variable_name Value
+rpl_recovery_rank 2
diff --git a/mysql-test/t/rpl_failsafe.test b/mysql-test/t/rpl_failsafe.test
new file mode 100644
index 00000000000..b8ef5b3f365
--- /dev/null
+++ b/mysql-test/t/rpl_failsafe.test
@@ -0,0 +1,5 @@
+source include/master-slave.inc;
+connection master;
+show variables like 'rpl_recovery_rank';
+connection slave;
+show variables like 'rpl_recovery_rank';