summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-12-12 18:55:33 -0700
committerunknown <sasha@mysql.sashanet.com>2001-12-12 18:55:33 -0700
commit623eedda2601f083c45a6f4af794e5b4b2703901 (patch)
tree7eaf5681e41349d3135b099f195338bc5e4b85c9 /mysql-test/r
parentb9562004e9d8e062790f6346bd8a0439fd5e8822 (diff)
downloadmariadb-git-623eedda2601f083c45a6f4af794e5b4b2703901.tar.gz
slave-skip-errors
added extra/mysql_install.c - will work on it in 4.0, but it does not hurt to have it sit in 3.23 tree for now since it will eventually be backported to 3.23 anyway Docs/manual.texi: documented slave-skip-errors updated change history extra/resolve_stack_dump.c: fixed wrong help message include/my_bitmap.h: bitmap code updates mysql-test/r/rpl_get_lock.result: test for a possible bug in release_lock() replication mysql-test/t/rpl_get_lock.test: test for possible bug in release_lock replication mysys/my_bitmap.c: bitmap code updates/clean-up sql/mysqld.cc: slave-skip-errors sql/slave.cc: slave-skip-errors sql/slave.h: slave skip errors
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/rpl_get_lock.result2
-rw-r--r--mysql-test/r/rpl_skip_error.result4
2 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_get_lock.result b/mysql-test/r/rpl_get_lock.result
index c261ee2861b..4cabeaf155f 100644
--- a/mysql-test/r/rpl_get_lock.result
+++ b/mysql-test/r/rpl_get_lock.result
@@ -1,3 +1,5 @@
+release_lock("lock")
+0
get_lock("lock",3)
1
n
diff --git a/mysql-test/r/rpl_skip_error.result b/mysql-test/r/rpl_skip_error.result
new file mode 100644
index 00000000000..f85b057eefa
--- /dev/null
+++ b/mysql-test/r/rpl_skip_error.result
@@ -0,0 +1,4 @@
+n
+1
+2
+3