From f72adc70e9f50c6abc6f5e7618c95e45557a545d Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 1 Feb 2008 20:26:39 +0100 Subject: [PATCH] Fixes to make tests pass in pushbuild. mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Result change. mysql-test/suite/binlog/t/binlog_start_comment.test: Removing --short-form since that cause test to fail. --- .../suite/binlog/r/binlog_row_mix_innodb_myisam.result | 6 ++++-- mysql-test/suite/binlog/t/binlog_start_comment.test | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result index 07de1f431a2..63bab2c1169 100644 --- a/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result +++ b/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result @@ -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 --git a/mysql-test/suite/binlog/t/binlog_start_comment.test b/mysql-test/suite/binlog/t/binlog_start_comment.test index 84889167cd2..a5817eb69b7 100644 --- a/mysql-test/suite/binlog/t/binlog_start_comment.test +++ b/mysql-test/suite/binlog/t/binlog_start_comment.test @@ -14,7 +14,7 @@ load data infile '../std_data_ln/words.dat' into table t1 -- load data to t1; 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;