database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Changes to make tests pass in pushbuild.

Browse Source 
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.
This commit is contained in:
unknown
2008-01-30 15:58:35 +01:00
parent 206770562d
commit 55fbcacfa6
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/bdb_notembedded.result
View File

@ -24,12 +24,18 @@ show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info 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 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`; 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`; 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`; 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`; BEGIN
f n Query 1 n use `test`; insert into bug16206 values(2) 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`; 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`; insert into bug16206 values(3)
f n Query 1 n use `test`; COMMIT
drop table bug16206; drop table bug16206;
set autocommit=0; set autocommit=0;
End of 5.0 tests End of 5.0 tests

10
mysql-test/r/rpl_loaddata_map.result
View File

@ -15,12 +15,10 @@ count(*)
show binlog events in 'master-bin.000002' from 98; show binlog events in 'master-bin.000002' from 98;
Log_name Pos Event_type Server_id End_log_pos Info 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 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 221 Begin_load_query 1 # ;file_id=#;block_len=8192
master-bin.000002 7412 Append_block 1 # ;file_id=1;block_len=7168 master-bin.000002 8436 Append_block 1 # ;file_id=#;block_len=8192
master-bin.000002 14603 Append_block 1 # ;file_id=1;block_len=2048 master-bin.000002 16651 Append_block 1 # ;file_id=#;block_len=7509
master-bin.000002 16674 Append_block 1 # ;file_id=1;block_len=7168 master-bin.000002 24183 Execute_load_query 1 # use `test`; load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=#
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
select count(*) from t2 /* 5 000 */; select count(*) from t2 /* 5 000 */;
count(*) count(*)
5000 5000

2
mysql-test/t/rpl_loaddata_map.test
View File

@ -35,7 +35,7 @@ select count(*) from t2 /* 5 000 */;
# the binglog will show fragmented Append_block events # the binglog will show fragmented Append_block events
--let $binlog_start=98 --let $binlog_start=98
--replace_column 5 # --replace_column 5 #
--replace_regex /\/\* xid=.* \*\//\/* XID *\// --replace_regex /\/\* xid=.* \*\//\/* XID *\// /file_id=[0-9]+/file_id=#/
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--eval show binlog events in 'master-bin.000002' from $binlog_start --eval show binlog events in 'master-bin.000002' from $binlog_start