bk commit into 5.0 tree (aelkin:1.2596) BUG#26622

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.0 repository of aelkin.  When aelkin does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-07 21:14:28+02:00, aelkin@mysql1000.(none) +6 -0
  Bug #26622 MASTER_POS_WAIT does not work as documented
  
  Affected tests fixing. After the fix for st_relay_log_info::wait_for_pos() that
  handles widely used select('master-bin.xxxx',pos) invoked by mysqltest
  there appeared to be four tests that either tried synchronizing when
  the slave was stopped or used incorrect synchronization method like
  to call `sync_with_master' from the current connection being to the
  master itself.
  
  Fixed with correcting the current connection or/and using the correct
  synchronization macro when possible.

  mysql-test/r/rpl_loaddata.result@stripped, 2008-03-07 21:14:26+02:00,
aelkin@mysql1000.(none) +2 -1
    results changed

  mysql-test/r/rpl_slave_status.result@stripped, 2008-03-07 21:14:26+02:00,
aelkin@mysql1000.(none) +1 -0
    results changed

  mysql-test/t/rpl_loaddata.test@stripped, 2008-03-07 21:14:26+02:00, aelkin@mysql1000.(none)
+11 -2
    fixing cleanup for two tests

  mysql-test/t/rpl_skip_error.test@stripped, 2008-03-07 21:14:26+02:00,
aelkin@mysql1000.(none) +3 -2
    fixing cleanup for two tests

  mysql-test/t/rpl_slave_status.test@stripped, 2008-03-07 21:14:26+02:00,
aelkin@mysql1000.(none) +5 -1
    fixing cleanup

  mysql-test/t/rpl_temporary.test@stripped, 2008-03-07 21:14:27+02:00, aelkin@mysql1000.(none)
+3 -2
    fixing synchronizations to use the intended correct macro.

diff -Nrup a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result
--- a/mysql-test/r/rpl_loaddata.result	2007-06-01 17:04:23 +03:00
+++ b/mysql-test/r/rpl_loaddata.result	2008-03-07 21:14:26 +02:00
@@ -77,7 +77,8 @@ load data infile '../std_data_ln/rpl_loa
 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 1
-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;
diff -Nrup a/mysql-test/r/rpl_slave_status.result b/mysql-test/r/rpl_slave_status.result
--- a/mysql-test/r/rpl_slave_status.result	2006-05-12 19:40:23 +03:00
+++ b/mysql-test/r/rpl_slave_status.result	2008-03-07 21:14:26 +02:00
@@ -53,3 +53,4 @@ Master_SSL_Cipher	
 Master_SSL_Key	
 Seconds_Behind_Master	NULL
 drop table t1;
+drop table t1;
diff -Nrup a/mysql-test/t/rpl_loaddata.test b/mysql-test/t/rpl_loaddata.test
--- a/mysql-test/t/rpl_loaddata.test	2007-06-01 17:04:23 +03:00
+++ b/mysql-test/t/rpl_loaddata.test	2008-03-07 21:14:26 +02:00
@@ -147,12 +147,20 @@ terminated by ',' optionally enclosed by
 '\n##\n' starting by '>' ignore 1 lines;
 connection slave;
 wait_for_slave_to_stop;
-drop table t2;
+
+# cleanup:
+
+set @@global.sql_slave_skip_counter=1;
+start slave;
+
 connection master;
 drop table t2;
 drop table t1;
 
+sync_slave_with_master;
+
 # BUG#17233 LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed
+connection master;
 CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB;
 
 --error 1062
@@ -160,5 +168,6 @@ LOAD DATA INFILE "../std_data_ln/words.d
 
 DROP TABLE t1;
 
-sync_with_master;
+sync_slave_with_master;
+
 # End of 4.1 tests
diff -Nrup a/mysql-test/t/rpl_skip_error.test b/mysql-test/t/rpl_skip_error.test
--- a/mysql-test/t/rpl_skip_error.test	2007-06-22 07:28:36 +03:00
+++ b/mysql-test/t/rpl_skip_error.test	2008-03-07 21:14:26 +02:00
@@ -15,12 +15,13 @@ select * from t1;
 
 connection master;
 drop table t1;
-sync_with_master;
+sync_slave_with_master;
 # End of 4.1 tests
 
 #
 # #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;
@@ -36,5 +37,5 @@ select * from t1;
 show slave status;
 connection master;
 drop table t1;
-sync_with_master;
+sync_slave_with_master;
 # End of 5.0 tests
diff -Nrup a/mysql-test/t/rpl_slave_status.test b/mysql-test/t/rpl_slave_status.test
--- a/mysql-test/t/rpl_slave_status.test	2006-10-07 21:19:53 +03:00
+++ b/mysql-test/t/rpl_slave_status.test	2008-03-07 21:14:26 +02:00
@@ -29,8 +29,12 @@ start slave;
 --vertical_results
 show slave status;
 
+# cleanup: slave io thread has been stopped "irrecoverably"
+# so we clean up mess manually
+
 connection master;
 drop table t1;
-sync_with_master;
+connection slave;
+drop table t1;
 
 # end of 4.1 tests
diff -Nrup a/mysql-test/t/rpl_temporary.test b/mysql-test/t/rpl_temporary.test
--- a/mysql-test/t/rpl_temporary.test	2007-11-05 17:20:08 +02:00
+++ b/mysql-test/t/rpl_temporary.test	2008-03-07 21:14:27 +02:00
@@ -130,7 +130,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
 
@@ -141,7 +141,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
 source include/get_binlog_dump_thread_id.inc;
 insert into t4 values (1);