From: Lars Thalmann
Date: December 22 2005 2:38am
Subject: bk commit into 5.1 tree (lars:1.1979)
List-Archive: http://lists.mysql.com/commits/348
Message-Id: <200512220238.jBM2cdXt016719@dl145h.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann 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.1979 05/12/22 03:38:24 lars@stripped +5 -0
  WL#1012: Test fixes

  mysql-test/t/binlog_stm_innodb_stat-master.opt
    1.1 05/12/22 03:37:20 lars@stripped +1 -0
    Missing option file.  The option file was needed to force a restart of the server to make values deterministic

  mysql-test/t/rpl_loaddata_s.test
    1.6 05/12/22 03:37:20 lars@stripped +1 -0
    This test only valid in SBR mode

  mysql-test/t/mysqlbinlog_base64.test
    1.4 05/12/22 03:37:20 lars@stripped +1 -0
    This test only valid in RBR mode

  mysql-test/t/disabled.def
    1.21 05/12/22 03:37:20 lars@stripped +3 -0
    Disabled tests that fail due to RBR code

  mysql-test/t/binlog_stm_innodb_stat-master.opt
    1.0 05/12/22 03:37:20 lars@stripped +0 -0
    BitKeeper file /users/lthalmann/bk/mysql-5.1-wl1012-v3-nodebug/mysql-test/t/binlog_stm_innodb_stat-master.opt

  mysql-test/r/rpl_loaddata_s.result
    1.5 05/12/22 03:37:19 lars@stripped +0 -2
    It is expressed in the test that the binlog should be empty

# 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:	lars
# Host:	dl145h.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-wl1012-v3-nodebug

--- 1.20/mysql-test/t/disabled.def	2005-12-21 18:29:28 +01:00
+++ 1.21/mysql-test/t/disabled.def	2005-12-22 03:37:20 +01:00
@@ -22,3 +22,6 @@
 innodb_concurrent : Results are not deterministic, Elliot will fix (BUG#3300)
 subselect       : Bug#15706
 type_time       : Bug#15805
+rpl000002       : Bug#15920 Temporary tables are not binlogged in SBR
+ps_7ndb         : Bug#15923 Core dump in RBR mode when executing test suite
+sp_trans        : Bug#15924 Code dump in RBR mode when executing test suite
--- New file ---
+++ mysql-test/t/binlog_stm_innodb_stat-master.opt	05/12/22 03:37:20
--binlog_cache_size=32768


--- 1.3/mysql-test/t/mysqlbinlog_base64.test	2005-12-20 01:12:03 +01:00
+++ 1.4/mysql-test/t/mysqlbinlog_base64.test	2005-12-22 03:37:20 +01:00
@@ -1,3 +1,4 @@
+-- source include/have_binlog_format_row.inc
 #
 #  Write different events to binlog
 #

--- 1.4/mysql-test/r/rpl_loaddata_s.result	2005-12-21 21:47:06 +01:00
+++ 1.5/mysql-test/r/rpl_loaddata_s.result	2005-12-22 03:37:19 +01:00
@@ -12,5 +12,3 @@
 2
 show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	#	Table_map	1	#	test.t1
-slave-bin.000001	#	Write_rows	1	#	

--- 1.5/mysql-test/t/rpl_loaddata_s.test	2005-12-14 16:45:01 +01:00
+++ 1.6/mysql-test/t/rpl_loaddata_s.test	2005-12-22 03:37:20 +01:00
@@ -2,6 +2,7 @@
 # replicated LOAD DATA INFILE correctly when it has binlog_*_db rules.
 # This is for BUG#1100 (LOAD DATA INFILE was half-logged).
 
+-- source include/have_binlog_format_statement.inc
 -- source include/master-slave.inc
 
 connection slave;