bk commit into 5.1 tree (gkodinov:1.2521)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of kgeorge. When kgeorge 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, 2007-06-20 09:54:42+03:00, gkodinov@stripped +2 -0
  removed undeterministic tests introduced by the fix for bug 26418

  mysql-test/r/rpl_innodb.result@stripped, 2007-06-20 09:54:40+03:00, gkodinov@stripped +0
-24
    removed undeterministic tests

  mysql-test/t/rpl_innodb.test@stripped, 2007-06-20 09:54:40+03:00, gkodinov@stripped +0 -4
    removed undeterministic tests

# 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:	gkodinov
# Host:	magare.gmz
# Root:	/home/kgeorge/mysql/autopush/B26418-5.1-opt

--- 1.3/mysql-test/r/rpl_innodb.result	2007-06-19 14:27:52 +03:00
+++ 1.4/mysql-test/r/rpl_innodb.result	2007-06-20 09:54:40 +03:00
@@ -77,31 +77,7 @@ SELECT COUNT(*) FROM mysqltest1.t1;
 COUNT(*)
 2
 FLUSH LOGS;
-SHOW BINLOG EVENTS IN 'slave-bin.000002' LIMIT 1,8;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-x	x	x	x	x	DROP DATABASE IF EXISTS mysqltest1
-x	x	x	x	x	CREATE DATABASE mysqltest1
-x	x	x	x	x	use `test`; CREATE TEMPORARY TABLE mysqltest1.tmp (f1 BIGINT)
-x	x	x	x	x	use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE="InnoDB"
-x	x	x	x	x	use `test`; INSERT INTO mysqltest1.t1 SET f1= 1
-x	x	x	x	x	use `test`; DROP TEMPORARY TABLE mysqltest1.tmp
-x	x	x	x	x	use `test`; INSERT INTO mysqltest1.t1 SET f1= 2
-x	x	x	x	x	use `test`; CREATE TEMPORARY TABLE mysqltest1.tmp2(a INT)
 -------- switch to master --------
 FLUSH LOGS;
-SHOW BINLOG EVENTS IN 'master-bin.000002' LIMIT 1,12;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-x	x	x	x	x	DROP DATABASE IF EXISTS mysqltest1
-x	x	x	x	x	CREATE DATABASE mysqltest1
-x	x	x	x	x	use `test`; CREATE TEMPORARY TABLE mysqltest1.tmp (f1 BIGINT)
-x	x	x	x	x	use `test`; CREATE TABLE mysqltest1.t1 (f1 BIGINT) ENGINE="InnoDB"
-x	x	x	x	x	use `test`; BEGIN
-x	x	x	x	x	use `test`; INSERT INTO mysqltest1.t1 SET f1= 1
-x	x	x	x	x	use `test`; DROP TEMPORARY TABLE mysqltest1.tmp
-x	x	x	x	x	use `test`; ROLLBACK
-x	x	x	x	x	use `test`; BEGIN
-x	x	x	x	x	use `test`; INSERT INTO mysqltest1.t1 SET f1= 2
-x	x	x	x	x	use `test`; CREATE TEMPORARY TABLE mysqltest1.tmp2(a INT)
-x	x	x	x	x	use `test`; ROLLBACK
 DROP DATABASE mysqltest1;
 End of 5.1 tests

--- 1.4/mysql-test/t/rpl_innodb.test	2007-06-19 14:27:52 +03:00
+++ 1.5/mysql-test/t/rpl_innodb.test	2007-06-20 09:54:40 +03:00
@@ -104,14 +104,10 @@ SHOW CREATE TABLE mysqltest1.tmp2;
 # it can't be rolled back by the master's ROLLBACK.
 SELECT COUNT(*) FROM mysqltest1.t1;
 FLUSH LOGS;
---replace_column 1 x 2 x 3 x 4 x 5 x
-SHOW BINLOG EVENTS IN 'slave-bin.000002' LIMIT 1,8;
 
 --echo -------- switch to master --------
 connection master;
 FLUSH LOGS;
---replace_column 1 x 2 x 3 x 4 x 5 x
-SHOW BINLOG EVENTS IN 'master-bin.000002' LIMIT 1,12;
 
 DROP DATABASE mysqltest1;
 -- source include/master-slave-end.inc