summaryrefslogtreecommitdiff
path: root/mysql-test/r/rpl_failsafe.result
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-12-13 12:05:24 +0200
committerunknown <monty@mashka.mysql.fi>2002-12-13 12:05:24 +0200
commit6a2ce08600d55898d3a4487f8d502aa3d9d988c9 (patch)
tree6a8b0b088d16eee7a2aa99dacf13542221f8ef4f /mysql-test/r/rpl_failsafe.result
parente6783a8785925f0e7433cd96d8f7f8b5c6d0c9a0 (diff)
downloadmariadb-git-6a2ce08600d55898d3a4487f8d502aa3d9d988c9.tar.gz
RESET SLAVE and CHANGE MASTER will now give an error if slave is running.
This fixes a problem in replication where RESET SLAVE could crash a running slave. mysql-test/r/rpl_failsafe.result: Added missing drop mysql-test/r/rpl_log_pos.result: Added slave stop before change master mysql-test/t/rpl_log_pos.test: Added slave stop before change master sql/sql_parse.cc: reset_slave() sends it's own errors sql/sql_repl.cc: reset_slave() sends it own error. RESET SLAVE and CHANGE MASTER will now give an error if slave is running. This fixes a problem in replication where RESET SLAVE could crash a running slave.
Diffstat (limited to 'mysql-test/r/rpl_failsafe.result')
-rw-r--r--mysql-test/r/rpl_failsafe.result1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_failsafe.result b/mysql-test/r/rpl_failsafe.result
index 14b749fada9..7e8aeea64f7 100644
--- a/mysql-test/r/rpl_failsafe.result
+++ b/mysql-test/r/rpl_failsafe.result
@@ -1,4 +1,5 @@
slave stop;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;