From b4a0b2c2f862ab0de853dc34e1e56f6159043e45 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Sat, 2 Jul 2011 22:12:12 +0200
Subject: post-merge fixes. most tests pass. 5.3 merge is next

---
 mysql-test/suite/rpl/r/rpl_rotate_logs.result | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mysql-test/suite/rpl/r/rpl_rotate_logs.result')

diff --git a/mysql-test/suite/rpl/r/rpl_rotate_logs.result b/mysql-test/suite/rpl/r/rpl_rotate_logs.result
index 279ab88bde3..9144d3c0e72 100644
--- a/mysql-test/suite/rpl/r/rpl_rotate_logs.result
+++ b/mysql-test/suite/rpl/r/rpl_rotate_logs.result
@@ -88,8 +88,8 @@ master-bin.000009	#	<Binlog_Do_DB>	<Binlog_Ignore_DB>
 select * from t4;
 a
 testing temporary tables part 2
-Master_Log_File	master-bin.000009
-Relay_Master_Log_File	master-bin.000009
+Master_Log_File = 'master-bin.000009'
+Relay_Master_Log_File = 'master-bin.000009'
 include/check_slave_is_running.inc
 lock tables t3 read;
 select count(*) from t3 where n >= 4;
-- 
cgit v1.2.1