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 

5 files changed, 23 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
diff --git a/mysql-test/t/rpl_get_lock.test b/mysql-test/t/rpl_get_lock.test
index 45adf99ed21..d4b5bffc409 100644
--- a/mysql-test/t/rpl_get_lock.test
+++ b/mysql-test/t/rpl_get_lock.test
@@ -4,6 +4,7 @@ create table t1(n int);
 insert into t1 values(get_lock("lock",2));
 dirty_close master;
 connection master1;
+select release_lock("lock");
 save_master_pos;
 connection slave;
 sync_with_master;
diff --git a/mysql-test/t/rpl_skip_error-slave.opt b/mysql-test/t/rpl_skip_error-slave.opt
new file mode 100644
index 00000000000..f6f258f799f
--- /dev/null
+++ b/mysql-test/t/rpl_skip_error-slave.opt
@@ -0,0 +1 @@
+--slave-skip-error=1053,1062
diff --git a/mysql-test/t/rpl_skip_error.test b/mysql-test/t/rpl_skip_error.test
new file mode 100644
index 00000000000..3303b45c1ca
--- /dev/null
+++ b/mysql-test/t/rpl_skip_error.test
@@ -0,0 +1,15 @@
+source include/master-slave.inc;
+connection master;
+drop table if exists t1;
+create table t1 (n int not null primary key);
+save_master_pos;
+connection slave;
+sync_with_master;
+insert into t1 values (1);
+connection master;
+insert into t1 values (1);
+insert into t1 values (2),(3);
+save_master_pos;
+connection slave;
+sync_with_master;
+select * from t1;