bk commit into 5.1 tree (mats:1.2169)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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
  1.2169 06/06/15 16:53:12 mats@stripped +4 -0
  Various fixes to allow tests to pass.

  mysql-test/t/rpl_truncate_7ndb.test
    1.3 06/06/15 16:53:04 mats@stripped +2 -0
    Adding sleep to allow NDB to write events to the binary log.

  mysql-test/t/rpl_row_basic_11bugs.test
    1.8 06/06/15 16:53:04 mats@stripped +3 -0
    Adding code to replace server version

  mysql-test/t/disabled.def
    1.159 06/06/15 16:53:04 mats@stripped +1 -0
    Disabling test due to already reported bug.

  mysql-test/r/rpl_row_basic_11bugs.result
    1.9 06/06/15 16:53:04 mats@stripped +1 -1
    Result change

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	romeo.(none)
# Root:	/home/bk/b19066-mysql-5.1-new

--- 1.158/mysql-test/t/disabled.def	2006-06-13 12:54:15 +02:00
+++ 1.159/mysql-test/t/disabled.def	2006-06-15 16:53:04 +02:00
@@ -35,6 +35,7 @@
 rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly
 rpl_row_func003 	 : BUG#19074 2006-13-04 andrei  test failed
 rpl_sp                   : BUG#16456 2006-02-16 jmiller
+rpl_sp_effects           : BUG#19862 2006-06-15 mkindahl
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 #ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events

--- 1.8/mysql-test/r/rpl_row_basic_11bugs.result	2006-06-13 20:59:39 +02:00
+++ 1.9/mysql-test/r/rpl_row_basic_11bugs.result	2006-06-15 16:53:04 +02:00
@@ -56,7 +56,7 @@
 UPDATE t1 SET a=99 WHERE a = 0;
 SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	102	Server ver: 5.1.11-beta-debug-log, Binlog ver: 4
+master-bin.000001	4	Format_desc	1	102	Server ver: SERVER_VERSION, Binlog ver: 4
 master-bin.000001	102	Query	1	188	use `test`; CREATE TABLE t1 (a INT)
 master-bin.000001	188	Table_map	1	227	table_id: # (test.t1)
 master-bin.000001	227	Write_rows	1	266	table_id: # flags: STMT_END_F

--- 1.7/mysql-test/t/rpl_row_basic_11bugs.test	2006-05-31 19:21:41 +02:00
+++ 1.8/mysql-test/t/rpl_row_basic_11bugs.test	2006-06-15 16:53:04 +02:00
@@ -2,6 +2,8 @@
 --source include/have_binlog_format_row.inc
 
 
+let $SERVER_VERSION=`select version()`;
+
 #This test case is not written for NDB, the result files 
 #will not match when NDB is the default engine
 -- source include/not_ndb_default.inc
@@ -49,5 +51,6 @@
 INSERT INTO t1 VALUES (1),(2);
 DELETE FROM t1 WHERE a = 0;
 UPDATE t1 SET a=99 WHERE a = 0;
+--replace_result $SERVER_VERSION SERVER_VERSION
 --replace_regex /table_id: [0-9]+/table_id: #/
 SHOW BINLOG EVENTS;

--- 1.2/mysql-test/t/rpl_truncate_7ndb.test	2006-06-13 20:59:39 +02:00
+++ 1.3/mysql-test/t/rpl_truncate_7ndb.test	2006-06-15 16:53:04 +02:00
@@ -22,6 +22,8 @@
 INSERT INTO t1 VALUES (1,1), (2,2);
 SELECT * FROM t1 ORDER BY a,b;
 --echo **** On Slave ****
+# This is silly, but NDB doesn't add to the binlog fast enough
+--real_sleep 10
 sync_slave_with_master;
 INSERT INTO t1 VALUE (3,3);
 SELECT * FROM t1 ORDER BY a,b;