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

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


BitKeeper/deleted/.del-binlog_start_comment.result:
  Auto merged
BitKeeper/deleted/.del-binlog_start_comment.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_timezone.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Manual merge.

mysql-test/r/binlog_start_comment.result

@@ -1,14 +0,0 @@
-drop table if exists t1,t2;
-create table t1 (word varchar(20)) -- create table t1;
-create table t2 (word varchar(20)) -- create table t2;
-load data infile '../std_data_ln/words.dat' into table t1 -- load data to t1;
-insert into t2 values ("Ada");
-flush logs;
-select * from t2;
-word
-Ada
-flush logs;
-select * from t2;
-word
-Ada
-drop table t1,t2;

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

@@ -86,11 +86,13 @@ connection master;
 CALL test.p1();
 let $wait_condition= SELECT COUNT(*) = 4 FROM t3;
 --source include/wait_condition.inc
+save_master_pos;
 SELECT * FROM test.t3 ORDER BY id3;
 
 let $message=< ---- Slave selects-- >;
 --source include/show_msg.inc
 connection slave;
+sync_with_master;
 SELECT * FROM test.t3 ORDER BY id3;
 
 connection master;

mysql-test/t/binlog_start_comment.test

@@ -1,18 +0,0 @@
-# Test case for bug#32205 Replaying statements from mysqlbinlog fails
-# with a syntax error, replicates fine
-
--- source include/have_log_bin.inc
---disable_warnings
-drop table if exists t1,t2;
---enable_warnings
-create table t1 (word varchar(20)) -- create table t1;
-create table t2 (word varchar(20)) -- create table t2;
-load data infile '../std_data_ln/words.dat' into table t1 -- load data to t1;
-insert into t2 values ("Ada");
-flush logs;
-select * from t2;
---exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 | $MYSQL
-flush logs;
-select * from t2;
-
-drop table t1,t2;