mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Attempt to fix Windows testcase output issue

Browse source
This commit is contained in:
He Zhenxing 2009-10-14 21:25:11 +08:00
parent bf0aa2bd34
commit adab17b9e6
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result
View file

@ -1,6 +1,6 @@
Verbose statements from : write-partial-row.binlog Verbose statements from : write-partial-row.binlog
select txt from raw_binlog_rows where txt like '###%'; select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
txt stmt
### INSERT INTO mysql.ndb_apply_status ### INSERT INTO mysql.ndb_apply_status
### SET ### SET
### @1=1 ### @1=1
@ -37,8 +37,8 @@ txt
### @1=2 ### @1=2
drop table raw_binlog_rows; drop table raw_binlog_rows;
Verbose statements from : write-full-row.binlog Verbose statements from : write-full-row.binlog
select txt from raw_binlog_rows where txt like '###%'; select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
txt stmt
### INSERT INTO mysql.ndb_apply_status ### INSERT INTO mysql.ndb_apply_status
### SET ### SET
### @1=2 ### @1=2
@ -76,8 +76,8 @@ txt
### @1=2 ### @1=2
drop table raw_binlog_rows; drop table raw_binlog_rows;
Verbose statements from : update-partial-row.binlog Verbose statements from : update-partial-row.binlog
select txt from raw_binlog_rows where txt like '###%'; select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
txt stmt
### INSERT INTO mysql.ndb_apply_status ### INSERT INTO mysql.ndb_apply_status
### SET ### SET
### @1=3 ### @1=3
@ -117,8 +117,8 @@ txt
### @1=2 ### @1=2
drop table raw_binlog_rows; drop table raw_binlog_rows;
Verbose statements from : update-full-row.binlog Verbose statements from : update-full-row.binlog
select txt from raw_binlog_rows where txt like '###%'; select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
txt stmt
### INSERT INTO mysql.ndb_apply_status ### INSERT INTO mysql.ndb_apply_status
### SET ### SET
### @1=4 ### @1=4

12
mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_verbose.test
View file

@ -45,7 +45,8 @@ create table raw_binlog_rows (txt varchar(1000));
--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_verbose.sql --remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_verbose.sql
--enable_query_log --enable_query_log
--echo Verbose statements from : $binlog_file --echo Verbose statements from : $binlog_file
select txt from raw_binlog_rows where txt like '###%'; # Output --verbose lines, with extra Windows CR's trimmed
select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
drop table raw_binlog_rows; drop table raw_binlog_rows;
--disable_query_log --disable_query_log
@ -56,7 +57,8 @@ create table raw_binlog_rows (txt varchar(1000));
--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_verbose.sql --remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_verbose.sql
--enable_query_log --enable_query_log
--echo Verbose statements from : $binlog_file --echo Verbose statements from : $binlog_file
select txt from raw_binlog_rows where txt like '###%'; # Output --verbose lines, with extra Windows CR's trimmed
select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
drop table raw_binlog_rows; drop table raw_binlog_rows;
--disable_query_log --disable_query_log
@ -67,7 +69,8 @@ create table raw_binlog_rows (txt varchar(1000));
--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_verbose.sql --remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_verbose.sql
--enable_query_log --enable_query_log
--echo Verbose statements from : $binlog_file --echo Verbose statements from : $binlog_file
select txt from raw_binlog_rows where txt like '###%'; # Output --verbose lines, with extra Windows CR's trimmed
select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
drop table raw_binlog_rows; drop table raw_binlog_rows;
--disable_query_log --disable_query_log
@ -78,5 +81,6 @@ create table raw_binlog_rows (txt varchar(1000));
--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_verbose.sql --remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_verbose.sql
--enable_query_log --enable_query_log
--echo Verbose statements from : $binlog_file --echo Verbose statements from : $binlog_file
select txt from raw_binlog_rows where txt like '###%'; # Output --verbose lines, with extra Windows CR's trimmed
select replace(txt,'\r', '') as stmt from raw_binlog_rows where txt like '###%';
drop table raw_binlog_rows; drop table raw_binlog_rows;