diff options
| author | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 15:58:35 +0100 |
|---|---|---|
| committer | unknown <mkindahl@dl145h.mysql.com> | 2008-01-30 15:58:35 +0100 |
| commit | 55fbcacfa6e4795fdf7e0837fbff2f21ed8f8193 (patch) | |
| tree | 4f9354b2628029a85733083b29b5dd488c21bff3 | |
| parent | 206770562d2e3bd33599d5ea2aedfb31154c1487 (diff) | |
| download | mariadb-git-55fbcacfa6e4795fdf7e0837fbff2f21ed8f8193.tar.gz | |
Changes to make tests pass in pushbuild.
mysql-test/r/bdb_notembedded.result:
Result change.
mysql-test/r/rpl_loaddata_map.result:
Result change.
mysql-test/t/rpl_loaddata_map.test:
Blanking out file id as well.
| -rw-r--r-- | mysql-test/r/bdb_notembedded.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/rpl_loaddata_map.result | 10 | ||||
| -rw-r--r-- | mysql-test/t/rpl_loaddata_map.test | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/mysql-test/r/bdb_notembedded.result b/mysql-test/r/bdb_notembedded.result index 14cb5fad915..2367e0d3fda 100644 --- a/mysql-test/r/bdb_notembedded.result +++ b/mysql-test/r/bdb_notembedded.result @@ -24,12 +24,18 @@ show binlog events; Log_name Pos Event_type Server_id End_log_pos Info f n Format_desc 1 n Server ver: VERSION, Binlog ver: 4 f n Query 1 n use `test`; create table bug16206 (a int) engine= bdb +f n Query 1 n use `test`; BEGIN f n Query 1 n use `test`; insert into bug16206 values(0) +f n Query 1 n use `test`; COMMIT +f n Query 1 n use `test`; BEGIN f n Query 1 n use `test`; insert into bug16206 values(1) +f n Query 1 n use `test`; COMMIT f n Query 1 n use `test`; BEGIN f n Query 1 n use `test`; insert into bug16206 values(2) f n Query 1 n use `test`; COMMIT +f n Query 1 n use `test`; BEGIN f n Query 1 n use `test`; insert into bug16206 values(3) +f n Query 1 n use `test`; COMMIT drop table bug16206; set autocommit=0; End of 5.0 tests diff --git a/mysql-test/r/rpl_loaddata_map.result b/mysql-test/r/rpl_loaddata_map.result index 9bb02f5db1b..c2159adef6a 100644 --- a/mysql-test/r/rpl_loaddata_map.result +++ b/mysql-test/r/rpl_loaddata_map.result @@ -15,12 +15,10 @@ count(*) show binlog events in 'master-bin.000002' from 98; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000002 98 Query 1 # use `test`; create table t2 (id int not null primary key auto_increment) -master-bin.000002 221 Begin_load_query 1 # ;file_id=1;block_len=7168 -master-bin.000002 7412 Append_block 1 # ;file_id=1;block_len=7168 -master-bin.000002 14603 Append_block 1 # ;file_id=1;block_len=2048 -master-bin.000002 16674 Append_block 1 # ;file_id=1;block_len=7168 -master-bin.000002 23865 Append_block 1 # ;file_id=1;block_len=341 -master-bin.000002 24229 Execute_load_query 1 # use `test`; load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=1 +master-bin.000002 221 Begin_load_query 1 # ;file_id=#;block_len=8192 +master-bin.000002 8436 Append_block 1 # ;file_id=#;block_len=8192 +master-bin.000002 16651 Append_block 1 # ;file_id=#;block_len=7509 +master-bin.000002 24183 Execute_load_query 1 # use `test`; load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=# select count(*) from t2 /* 5 000 */; count(*) 5000 diff --git a/mysql-test/t/rpl_loaddata_map.test b/mysql-test/t/rpl_loaddata_map.test index f3d14278396..0a2883bfcca 100644 --- a/mysql-test/t/rpl_loaddata_map.test +++ b/mysql-test/t/rpl_loaddata_map.test @@ -35,7 +35,7 @@ select count(*) from t2 /* 5 000 */; # the binglog will show fragmented Append_block events --let $binlog_start=98 --replace_column 5 # ---replace_regex /\/\* xid=.* \*\//\/* XID *\// +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /file_id=[0-9]+/file_id=#/ --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --eval show binlog events in 'master-bin.000002' from $binlog_start |