Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


mysql-test/suite/rpl/r/rpl_loaddata.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_master_pos_wait.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_slave_status.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_master_pos_wait.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_temporary.test:
  Auto merged
mysql-test/suite/rpl/t/rpl_loaddata.test:
  Manual merge. The rpl_loaddata.test file was moved on 5.1 by editing
  the file to include the file at the new location. This causes conflicts
  when merging, since the changes will not propagate to the moved file.
sql/slave.cc:
  Manual merge.
mysql-test/suite/rpl/t/rpl_skip_error.test:
  Manual merge.
mysql-test/suite/rpl/t/rpl_slave_status.test:
  Manual merge.

mysql-test/suite/rpl/r/rpl_loaddata.result

@@ -83,7 +83,8 @@ load data infile '../std_data_ln/rpl_loaddata2.dat' into table t2 fields
 terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
 '\n##\n' starting by '>' ignore 1 lines;
 ERROR 23000: Duplicate entry '2003-03-22' for key 'day'
-drop table t2;
+set @@global.sql_slave_skip_counter=1;
+start slave;
 drop table t2;
 drop table t1;
 CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB;

mysql-test/suite/rpl/r/rpl_master_pos_wait.result

@@ -16,3 +16,9 @@ select master_pos_wait('master-bin.999999',0);
 stop slave sql_thread;
 master_pos_wait('master-bin.999999',0)
 NULL
+"*** must be empty ***"
+show slave status;
+"*** must be NULL ***"
+select master_pos_wait('foo', 98);
+master_pos_wait('foo', 98)
+NULL

mysql-test/suite/rpl/t/rpl_master_pos_wait.test

@@ -15,4 +15,15 @@ stop slave sql_thread;
 connection slave;
 reap;
 
+#
+# bug#26622 MASTER_POS_WAIT does not work as documented
+#
+
+connection master;
+echo "*** must be empty ***";
+query_vertical show slave status;
+
+echo "*** must be NULL ***";
+select master_pos_wait('foo', 98);
+
 # End of 4.1 tests

mysql-test/suite/rpl/t/rpl_skip_error.test

@@ -37,17 +37,23 @@ insert into t1 values (1);
 # These should work fine
 insert into t1 values (2),(3);
 
---echo [on slave]
-sync_slave_with_master;
-select * from t1 ORDER BY n;
-
-
---echo ==== Test With sql_mode=strict_trans_tables ====
+save_master_pos;
+connection slave;
+sync_with_master;
+select * from t1;
 
-insert into t1 values (7), (8);
+connection master;
+drop table t1;
+sync_slave_with_master;
+# End of 4.1 tests
 
---echo [on master]
+#
+# #28839 Errors in strict mode silently stop SQL thread if --slave-skip-errors exists
+#
 connection master;
+create table t1(a int primary key);
+insert into t1 values (1),(2);
+delete from t1 where @@server_id=1;
 set sql_mode=strict_trans_tables;
 insert into t1 values (7), (8), (9);
 
@@ -62,5 +68,4 @@ source include/show_slave_status2.inc;
 connection master;
 drop table t1;
 sync_slave_with_master;
-
 # End of 5.0 tests

mysql-test/suite/rpl/t/rpl_slave_status.test

@@ -50,9 +50,10 @@ show slave status;
 connection slave;
 drop table t1;
 delete from mysql.user where user='rpl';
+# cleanup: slave io thread has been stopped "irrecoverably"
+# so we clean up mess manually
+
 connection master;
 drop table t1;
 
-# end of test case for BUG#10780
-
 # end of 4.1 tests

mysql-test/suite/rpl/t/rpl_temporary.test

@@ -132,7 +132,7 @@ drop table t1,t2;
 # don't get any memory leaks for this
 
 create temporary table t3 (f int);
-sync_with_master;
+sync_slave_with_master;
 
 # The server will now close done
 
@@ -143,7 +143,8 @@ sync_with_master;
 connection master;
 create temporary table t4 (f int);
 create table t5 (f int);
-sync_with_master;
+sync_slave_with_master;
+connection master;
 # find dumper's $id
 select id from information_schema.processlist where command='Binlog Dump' into @id;
 kill @id; # to stimulate reconnection by slave w/o timeout