database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Correct bad merge, and remove version numbers from test case.

Browse Source 
mysql-test/r/mysqlbinlog2.result:
  Change test case to remove server version number.
mysql-test/t/mysqlbinlog2.test:
  Change test case to remove server version number.
mysys/mf_iocache2.c:
  Correcting bad merge.
This commit is contained in:
unknown
2007-08-08 12:21:04 -04:00
parent aa7519299a
commit 3250963e7b
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,7 +41,7 @@ select "--- Local --" as "";
# be time dependent (the Start events). Better than nothing.
#
--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}/
--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}/ /binlog v [0-9]+, server v [^ ]* created/binlog v #, server v ## created/
--exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001
--disable_query_log