bk commit into 5.0 tree (serg:1.1875)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.0 repository of serg. When serg 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.1875 05/04/05 15:36:52 serg@stripped +1 -0
  fix broken mix_innodb_myisam_binlog.test

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.15 05/04/05 15:36:44 serg@stripped +9 -9
    fix broken mix_innodb_myisam_binlog.test

# 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:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-5.0

--- 1.14/mysql-test/t/mix_innodb_myisam_binlog.test	Sat Apr  2 05:02:07 2005
+++ 1.15/mysql-test/t/mix_innodb_myisam_binlog.test	Tue Apr  5 15:36:44 2005
@@ -29,7 +29,7 @@
 commit;
 
 --replace_column 5 #
---replace_result "xid=12" "xid=7"
+--replace_result "xid=15" "xid=8"
 show binlog events from 98;
 
 delete from t1;
@@ -58,7 +58,7 @@
 commit;
 
 --replace_column 5 #
---replace_result "xid=45" "xid=24"
+--replace_result "xid=48" "xid=25"
 show binlog events from 98;
 
 delete from t1;
@@ -76,7 +76,7 @@
 select a from t1 order by a; # check that savepoints work :)
 
 --replace_column 5 #
---replace_result "xid=67" "xid=36"
+--replace_result "xid=70" "xid=37"
 show binlog events from 98;
 
 # and when ROLLBACK is not explicit?
@@ -109,7 +109,7 @@
 insert into t2 select * from t1;
 
 --replace_column 5 #
---replace_result "xid=116" "xid=59"
+--replace_result "xid=119" "xid=60"
 show binlog events from 98;
 
 # Check that when the query updat1ng the MyISAM table is the first in the
@@ -122,13 +122,13 @@
 begin;
 insert into t2 select * from t1;
 --replace_column 5 #
---replace_result "xid=130" "xid=65"
+--replace_result "xid=133" "xid=66"
 show binlog events from 98;
 insert into t1 values(11);
 commit;
 
 --replace_column 5 #
---replace_result "xid=130" "xid=65" "xid=133" "xid=67"
+--replace_result "xid=133" "xid=66" "xid=136" "xid=68"
 show binlog events from 98;
 
 
@@ -147,7 +147,7 @@
 commit;
 
 --replace_column 5 #
---replace_result "xid=152" "xid=77"
+--replace_result "xid=155" "xid=78"
 show binlog events from 98;
 
 delete from t1;
@@ -175,7 +175,7 @@
 commit;
 
 --replace_column 5 #
---replace_result "xid=184" "xid=93"
+--replace_result "xid=187" "xid=94"
 show binlog events from 98;
 
 delete from t1;
@@ -193,7 +193,7 @@
 select a from t1 order by a; # check that savepoints work :)
 
 --replace_column 5 #
---replace_result "xid=205" "xid=104"
+--replace_result "xid=208" "xid=105"
 show binlog events from 98;
 
 # Test for BUG#5714, where a MyISAM update in the transaction used to