diff options
| author | unknown <guilhem@mysql.com> | 2003-06-10 23:31:09 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-06-10 23:31:09 +0200 |
| commit | 16ec93654cc523def6d3cc8bd96aba9c0c6c6c80 (patch) | |
| tree | bcde0df27846d0a1e1be6d30043331017465d6ef /mysql-test | |
| parent | a1a58d6c5a9799cd3746d5bef85a9347051ef356 (diff) | |
| parent | 0880795793f7c0c468bdb23f65050cc8ffd22d24 (diff) | |
| download | mariadb-git-16ec93654cc523def6d3cc8bd96aba9c0c6c6c80.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
mysql-test/mysql-test-run.sh:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 16 | ||||
| -rw-r--r-- | mysql-test/r/rpl000018.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl000018.test | 2 |
3 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 3fe9070bbd6..1d25a4d0e3d 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1070,6 +1070,16 @@ stop_slave () fi } +stop_slave_threads () +{ + eval "this_slave_running=\$SLAVE$1_RUNNING" + slave_ident="slave$1" + if [ x$this_slave_running = x1 ] + then + $MYSQLADMIN --no-defaults -uroot --socket=$MYSQL_TMP_DIR/$slave_ident.sock stop-slave > /dev/null 2>&1 + fi +} + stop_master () { if [ x$MASTER_RUNNING = x1 ] @@ -1163,6 +1173,12 @@ run_testcase () return fi + # Stop all slave threads, so that we don't have useless reconnection attempts + # and error messages in case the slave and master servers restart. + stop_slave_threads + stop_slave_threads 1 + stop_slave_threads 2 + if [ -z "$USE_RUNNING_SERVER" ] ; then if [ -f $master_opt_file ] ; diff --git a/mysql-test/r/rpl000018.result b/mysql-test/r/rpl000018.result index ba51406bba0..282c1e492a1 100644 --- a/mysql-test/r/rpl000018.result +++ b/mysql-test/r/rpl000018.result @@ -1,3 +1,4 @@ +reset master; reset slave; slave start; show master logs; diff --git a/mysql-test/t/rpl000018.test b/mysql-test/t/rpl000018.test index 291b482b912..3bd5fd0ef09 100644 --- a/mysql-test/t/rpl000018.test +++ b/mysql-test/t/rpl000018.test @@ -6,6 +6,8 @@ require_manager; connect (master,localhost,root,,test,0,master.sock); connect (slave,localhost,root,,test,0,slave.sock); +connection master; +reset master; server_stop master; server_start master; connection slave; |