bk commit into 5.1 tree (mkindahl:1.2522)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl.  When mkindahl 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, 2008-02-01 20:26:39+01:00, mkindahl@stripped +2 -0
  Fixes to make tests pass in pushbuild.

  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result@stripped, 2008-02-01
20:26:26+01:00, mkindahl@stripped +4 -2
    Result change.

  mysql-test/suite/binlog/t/binlog_start_comment.test@stripped, 2008-02-01 20:26:31+01:00,
mkindahl@stripped +1 -1
    Removing --short-form since that cause test to fail.

diff -Nrup a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
--- a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2008-01-30 12:33:45
+01:00
+++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result	2008-02-01 20:26:26
+01:00
@@ -415,9 +415,11 @@ is not null;
 is not null
 1
 select
-@a like "%#%error_code=0%ROLLBACK\n/*!*/;%ROLLBACK /* added by mysqlbinlog */;%",
+@a like "%#%error_code=0%ROLLBACK\n/*!*/;%ROLLBACK /* added by mysqlbinlog */;%" OR
+@a like "%#%error_code=0%ROLLBACK\r\n/*!*/;%ROLLBACK /* added by mysqlbinlog */;%",
 @a not like "%#%error_code=%error_code=%";
-@a like "%#%error_code=0%ROLLBACK\n/*!*/;%ROLLBACK /* added by mysqlbinlog */;%"	@a not
like "%#%error_code=%error_code=%"
+@a like "%#%error_code=0%ROLLBACK\n/*!*/;%ROLLBACK /* added by mysqlbinlog */;%" OR
+@a like "%#%error_code=0%ROLLBACK\r\n/*!*/;%ROLLBACK /* added by mysqlbinlog */;%"	@a not
like "%#%error_code=%error_code=%"
 1	1
 drop table t1, t2;
 create temporary table tt (a int unique);
diff -Nrup a/mysql-test/suite/binlog/t/binlog_start_comment.test
b/mysql-test/suite/binlog/t/binlog_start_comment.test
--- a/mysql-test/suite/binlog/t/binlog_start_comment.test	2008-02-01 13:44:44 +01:00
+++ b/mysql-test/suite/binlog/t/binlog_start_comment.test	2008-02-01 20:26:31 +01:00
@@ -14,7 +14,7 @@ load data infile '../std_data_ln/words.d
 insert into t2 values ("Ada");
 flush logs;
 select * from t2;
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/
$MYSQLTEST_VARDIR/log/master-bin.000001 >
$MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/
$MYSQLTEST_VARDIR/log/master-bin.000001 >
$MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
 --exec $MYSQL --local-infile=1 < $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
 flush logs;
 select * from t2;