database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

merge 5.1 main -> 5.1-rpl-testfixes

Browse Source 
all changes automerged without conflicts
This commit is contained in:
Sven Sandberg
2008-07-29 19:55:46 +02:00
parent e113042588 c6bf7ead8f
commit 5101f124e8
15 changed files with 180 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/show_binlog_events.inc
View File

@ -4,7 +4,7 @@ if (!$binlog_start)
{
let $binlog_start=106;
}
--replace_result $binlog_start <binlog_start>
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR $binlog_start <binlog_start>
--replace_column 2 # 4 # 5 #
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/
--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /file_id=[0-9]+/file_id=#/ /block_len=[0-9]+/block_len=#/
--eval show binlog events from $binlog_start