summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2000-12-13 09:58:26 -0700
committerunknown <sasha@mysql.sashanet.com>2000-12-13 09:58:26 -0700
commita3d15c0fff5c97c44875e8ba0a7727396cc39e5a (patch)
treedfe1d74e8791e737aac38dd0f59c47a51c1b4fee /mysql-test/t
parent20da4f88847125f59edf44e5e688f61abcbc7af2 (diff)
downloadmariadb-git-a3d15c0fff5c97c44875e8ba0a7727396cc39e5a.tar.gz
fixed
mysql-test/mysql-test-run: fixed bug that unconditionally restarted both servers before each test added support for slave-master-info.opt to specify master info options and override defaults for an individual test fixed race conditions in slave start/slave stop added a new rpl test case sql/sql_repl.cc: fixed race conditions in slave start/slave stop
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/rpl000015-slave-master-info.opt1
-rw-r--r--mysql-test/t/rpl000015.test24
2 files changed, 25 insertions, 0 deletions
diff --git a/mysql-test/t/rpl000015-slave-master-info.opt b/mysql-test/t/rpl000015-slave-master-info.opt
new file mode 100644
index 00000000000..80190bf6d29
--- /dev/null
+++ b/mysql-test/t/rpl000015-slave-master-info.opt
@@ -0,0 +1 @@
+--server-id=2
diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test
new file mode 100644
index 00000000000..599cf8f16d2
--- /dev/null
+++ b/mysql-test/t/rpl000015.test
@@ -0,0 +1,24 @@
+connect (master,localhost,root,,test,0,var/tmp/mysql.sock);
+connect (slave,localhost,root,,test,0,var/tmp/mysql-slave.sock);
+connection master;
+reset master;
+show master status;
+connection slave;
+reset slave;
+show slave status;
+change master to master_host='127.0.0.1';
+show slave status;
+change master to master_host='127.0.0.1',master_user='root',
+ master_password='',master_port=9306;
+show slave status;
+slave start;
+show slave status;
+connection master;
+drop table if exists foo;
+create table foo (n int);
+insert into foo values (10),(45),(90);
+connection slave;
+sleep 0.3;
+select * from foo;
+
+