diff options
| author | unknown <mats@romeo.(none)> | 2007-03-30 10:35:37 +0200 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2007-03-30 10:35:37 +0200 |
| commit | 02a794767f5dd500a0e5e03d0742be25512f88e5 (patch) | |
| tree | b08254eef06743bb5e66066864c2df900ce6bfe4 /mysql-test/include | |
| parent | 9aa4bf2fefec494dd06b2888088977cbe2d364a4 (diff) | |
| parent | 5a7b2fc76723fe60a9a07079624417c7c88c552f (diff) | |
| download | mariadb-git-02a794767f5dd500a0e5e03d0742be25512f88e5.tar.gz | |
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl
mysql-test/r/rpl_udf.result:
Manual merge.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/show_binlog_events.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/show_binlog_events.inc b/mysql-test/include/show_binlog_events.inc index 0aad243562b..7377b4a0fed 100644 --- a/mysql-test/include/show_binlog_events.inc +++ b/mysql-test/include/show_binlog_events.inc @@ -1,5 +1,5 @@ --let $binlog_start=106 --replace_result $binlog_start <binlog_start> --replace_column 2 # 4 # 5 # ---replace_regex /table_id: [0-9]+/table_id: #/ +--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ --eval show binlog events from $binlog_start |