bk commit into 5.1 tree (bar:1.2360)

[bar]

Below is the list of changes that have just been committed into a local
5.1 repository of bar. When bar 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, 2006-12-11 17:08:10+04:00, bar@stripped +2 -0
  after merge fix for bug N20396

  mysql-test/r/binlog_row_mix_innodb_myisam.result@stripped, 2006-12-11 17:08:06+04:00, bar@stripped +2 -2
    after merge fix for bug N20396

  mysql-test/t/binlog_row_mix_innodb_myisam.test@stripped, 2006-12-11 17:08:06+04:00, bar@stripped +1 -1
    after merge fix for bug N20396

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-5.1.b20396v2

--- 1.15/mysql-test/r/binlog_row_mix_innodb_myisam.result	2006-12-11 17:08:23 +04:00
+++ 1.16/mysql-test/r/binlog_row_mix_innodb_myisam.result	2006-12-11 17:08:23 +04:00
@@ -407,8 +407,8 @@ is not null;
 is not null
 1
 select
-@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",
+@a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%",
 @a not like "%#%error_code=%error_code=%";
-@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%"	@a not like "%#%error_code=%error_code=%"
+@a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%"	@a not like "%#%error_code=%error_code=%"
 1	1
 drop table t1, t2;

--- 1.4/mysql-test/t/binlog_row_mix_innodb_myisam.test	2006-12-11 17:08:23 +04:00
+++ 1.5/mysql-test/t/binlog_row_mix_innodb_myisam.test	2006-12-11 17:08:23 +04:00
@@ -26,6 +26,6 @@ eval select
 is not null;
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 eval select
-@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",
+@a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%",
 @a not like "%#%error_code=%error_code=%";
 drop table t1, t2;