summaryrefslogtreecommitdiff
path: root/mysql-test/t/variables-notembedded-master.opt
diff options
context:
space:
mode:
authorTatiana A. Nurnberg <azundris@mysql.com>2009-04-06 13:42:33 +0200
committerTatiana A. Nurnberg <azundris@mysql.com>2009-04-06 13:42:33 +0200
commit88a9e65ba63216b36900ba06d7c34ae608b6e017 (patch)
tree098220086c1c9b28c9e1c80a6234dc28222532e7 /mysql-test/t/variables-notembedded-master.opt
parentff9803acea8e7270e1b58f8221fbcd902580e052 (diff)
downloadmariadb-git-88a9e65ba63216b36900ba06d7c34ae608b6e017.tar.gz
Bug#43835: SHOW VARIABLES does not include 0 for slave_skip_errors
We didn't expect "error: no error", although this is in fact a legitimate state (if something is erroneous on the master, but not on the slave, e.g. INSERT fails on master due to UNIQUE constraint which does not exist on slave). We now list the ignore for "0: no error" the same way as any other ignore; moreover, if no or an empty --slave-skip-errors is passed at start-up, we show "OFF" instead of empty list, as intended. (The code for that was there, but was only run for the empty- argument case, even if it subsequently tested for both conditions.) mysql-test/r/not_embedded_server.result: Show that passing no --slave-skip-errors results in "OFF" being shown as the variable's value. This test's "twin" (also not embedded, but setting --slave-skip-errors in its -opt file) lives in variables-notembbeded.test. mysql-test/r/variables-notembedded.result: Show that error-ignore 0 is handled just like any other ignore. This test's "twin" (also not embedded, but not setting --slave-skip-errors in its -opt file) lives in not_embbeded_server.test. mysql-test/t/not_embedded_server.test: Show that passing no --slave-skip-errors results in "OFF" being shown as the variable's value. mysql-test/t/variables-notembedded-master.opt: Show that error-ignore 0 is handled just like any other ignore. sql/slave.cc: - set up error-ignore-info even if --slave-skip-errors was not passed at start-up. - handle error 0 just like any other error.
Diffstat (limited to 'mysql-test/t/variables-notembedded-master.opt')
-rw-r--r--mysql-test/t/variables-notembedded-master.opt2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/variables-notembedded-master.opt b/mysql-test/t/variables-notembedded-master.opt
index a684e591d10..8a173a043ac 100644
--- a/mysql-test/t/variables-notembedded-master.opt
+++ b/mysql-test/t/variables-notembedded-master.opt
@@ -1 +1 @@
---loose-slave-skip-errors=3,100,137,643,1752
+--loose-slave-skip-errors=3,100,137,0,643,1752