diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-08-02 12:51:49 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-08-02 12:51:49 -0400 |
| commit | 39bbd9833f3c35c3fefe15ebad419a6b02ef4d6e (patch) | |
| tree | 226a52fa7b1462495f8ac34cd3f396e05ef504c9 /mysql-test/t/mysqlbinlog2.test | |
| parent | 6f88aa45dbc129751890421b13e8c4e13b8bd888 (diff) | |
| parent | 1e48759d866447c3cf69db4929fc4882908fe307 (diff) | |
| download | mariadb-git-39bbd9833f3c35c3fefe15ebad419a6b02ef4d6e.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/.deleted/mysql-5.1-new-maint--bug27894
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
mysql-test/t/mysqlbinlog2.test:
Auto merged
mysys/mf_iocache2.c:
manual merge
Diffstat (limited to 'mysql-test/t/mysqlbinlog2.test')
| -rw-r--r-- | mysql-test/t/mysqlbinlog2.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/mysqlbinlog2.test b/mysql-test/t/mysqlbinlog2.test index 9e56b7a07c7..fa487662c10 100644 --- a/mysql-test/t/mysqlbinlog2.test +++ b/mysql-test/t/mysqlbinlog2.test @@ -41,7 +41,8 @@ select "--- Local --" as ""; # be time dependent (the Start events). Better than nothing. # ---exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000001 +--replace_regex /[[:<:]][0-9]{6} [0-9 ][0-9]:[0-9]{2}:[0-9]{2}[[:>:]]/{yymmdd} {HH:MM:SS}/ /=[0-9]+ /={integer} / /# at [0-9]+/# at {pos}/ /(pos:?) [0-9]+/\1 {pos}/ +--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 --disable_query_log select "--- offset --" as ""; |