diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-11-10 01:14:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-11-10 01:14:58 +0100 |
| commit | 7002291b8aa2e036a7adfd23d961dc09b4f01f46 (patch) | |
| tree | 18dc7afd966c2c7ec6b02b958d3d4bb0c701b021 /mysql-test/t/mysqlbinlog.test | |
| parent | d79fd5ba7ff275c9fd003f2486b42eb87892ca9a (diff) | |
| parent | 56394a78e361bf0205a506185ee95a0ab012b621 (diff) | |
| download | mariadb-git-7002291b8aa2e036a7adfd23d961dc09b4f01f46.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/t/mysqlbinlog.test')
| -rw-r--r-- | mysql-test/t/mysqlbinlog.test | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index e5bc36f6851..6988b2a8e9b 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -589,3 +589,9 @@ eval SET GLOBAL SERVER_ID = $old_server_id; --exec $MYSQL_BINLOG --hexdump std_data/mdev-4645-binlog_group_id.binlog --exec $MYSQL_BINLOG --hexdump std_data/mdev-4645-binlog_group_id_checksum.binlog --exec $MYSQL_BINLOG --hexdump std_data/mdev-4645-binlog_none.binlog + +# +# MDEV-12372 mysqlbinlog --version output is the same on 10.x as on 5.5.x, and contains not only version +# +replace_regex /.*mysqlbinlog(\.exe)? Ver .* for .* at [-_a-zA-Z0-9]+/mysqlbinlog Ver VER for OS at ARCH/; +exec $MYSQL_BINLOG --version; |