Commit 294571f0 authored by mkindahl@dl145h.mysql.com's avatar mkindahl@dl145h.mysql.com
Browse files

Various fixes to make tests pass on Windows.

parent 15b74eb7

mysql-test/r/mix_innodb_myisam_binlog.result

+4 −2
Original line number Diff line number Diff line
@@ -282,9 +282,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);

mysql-test/t/binlog_start_comment.test

+1 −1
Original line number Diff line number Diff line
@@ -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 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog

--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 --local-infile=1 < $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog

flush logs;

select * from t2;

mysql-test/t/mix_innodb_myisam_binlog.test

+2 −1
Original line number Diff line number Diff line
@@ -262,7 +262,8 @@ eval select 
is not null;

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval 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=%";

drop table t1, t2;