From 0ae6ee55a971218c61a6a05b730cb88776ea193d Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Thu, 4 Oct 2012 13:59:54 +0400 Subject: [PATCH] Test fix: Mask server version in relaylog events output --- mysql-test/suite/multi_source/multisource.result | 6 +++--- mysql-test/suite/multi_source/multisource.test | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/multi_source/multisource.result b/mysql-test/suite/multi_source/multisource.result index 4507b9c5676..61495e2fce2 100644 --- a/mysql-test/suite/multi_source/multisource.result +++ b/mysql-test/suite/multi_source/multisource.result @@ -29,13 +29,13 @@ mysqld-relay-bin-master1.000002 mysqld-relay-bin-master1.index show relaylog events; Log_name Pos Event_type Server_id End_log_pos Info -mysqld-relay-bin-master1.000001 4 Format_desc 3 246 Server ver: 10.0.0-MariaDB-debug-log, Binlog ver: 4 +mysqld-relay-bin-master1.000001 4 Format_desc 3 246 Server version mysqld-relay-bin-master1.000001 246 Rotate 3 304 mysqld-relay-bin-master1.000002;pos=4 show relaylog events in 'mysqld-relay-bin-master1.000002'; Log_name Pos Event_type Server_id End_log_pos Info -mysqld-relay-bin-master1.000002 4 Format_desc 3 246 Server ver: 10.0.0-MariaDB-debug-log, Binlog ver: 4 +mysqld-relay-bin-master1.000002 4 Format_desc 3 246 Server version mysqld-relay-bin-master1.000002 246 Rotate 1 0 master-bin.000001;pos=4 -mysqld-relay-bin-master1.000002 290 Format_desc 1 246 Server ver: 10.0.0-MariaDB-debug-log, Binlog ver: 4 +mysqld-relay-bin-master1.000002 290 Format_desc 1 246 Server version mysqld-relay-bin-master1.000002 532 Binlog_checkpoint 1 286 master-bin.000001 mysqld-relay-bin-master1.000002 572 Query 1 375 drop database if exists db1 mysqld-relay-bin-master1.000002 661 Query 1 456 create database db1 diff --git a/mysql-test/suite/multi_source/multisource.test b/mysql-test/suite/multi_source/multisource.test index b1e05051f59..df5309624bd 100644 --- a/mysql-test/suite/multi_source/multisource.test +++ b/mysql-test/suite/multi_source/multisource.test @@ -57,7 +57,9 @@ select * from db1.t1; # Check that relay logs are recognizable +--replace_regex /Server ver:.*/Server version/ show relaylog events; +--replace_regex /Server ver:.*/Server version/ show relaylog events in 'mysqld-relay-bin-master1.000002';