diff options
| author | unknown <guilhem@mysql.com> | 2003-03-03 23:12:17 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2003-03-03 23:12:17 +0100 |
| commit | a49822237db8b4b4620475abbcc79aefcf9c9a13 (patch) | |
| tree | e469d183a0ba46e33a317a6a29a9854d38dd0707 /mysql-test/include/master-slave.inc | |
| parent | c68620e6cc79957c9ac430eaf46778ab6110baad (diff) | |
| download | mariadb-git-a49822237db8b4b4620475abbcc79aefcf9c9a13.tar.gz | |
Do not give an error when the user does START SLAVE on an already
running slave, just give a warning. Same thing for STOP SLAVE.
This will make scripts writing easier for users.
include/mysqld_error.h:
New error codes (warning codes in fact) to warn that the slave was already started or stopped
mysql-test/include/master-slave.inc:
STOP SLAVE now prints a warning, not an error, so we should expect a warning here
sql/share/czech/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/danish/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/dutch/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/english/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/estonian/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/french/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/german/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/greek/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/hungarian/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/italian/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/japanese/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/korean/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/norwegian-ny/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/norwegian/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/polish/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/portuguese/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/romanian/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/russian/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/serbian/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/slovak/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/spanish/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/swedish/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/share/ukrainian/errmsg.txt:
New messages to warn that the slave was already started or stopped
sql/sql_repl.cc:
Do not give an error when the user does START SLAVE on an already
running slave, just give a warning. Same thing for STOP SLAVE.
Diffstat (limited to 'mysql-test/include/master-slave.inc')
| -rw-r--r-- | mysql-test/include/master-slave.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/include/master-slave.inc b/mysql-test/include/master-slave.inc index 008466c426f..5ec4b4379f8 100644 --- a/mysql-test/include/master-slave.inc +++ b/mysql-test/include/master-slave.inc @@ -3,8 +3,11 @@ connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,); connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,); connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,); connection slave; ---error 0,1199 -!stop slave; +#we expect STOP SLAVE to produce a warning as the slave is stopped +#(the server was started with skip-slave-start) +--disable_warnings +stop slave; +--enable_warnings @r/slave-stopped.result show status like 'Slave_running'; connection master; --disable_warnings |