Merge pilot.blaudden:/home/msvensson/mysql/bug27438/my50-bug27438

into  pilot.blaudden:/home/msvensson/mysql/bug27438/my51-bug27438


mysql-test/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged

2 files changed, 16 insertions, 4 deletions

diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result
index 9adde45f87a..f82a1a69060 100644
--- a/mysql-test/r/rpl_rotate_logs.result
+++ b/mysql-test/r/rpl_rotate_logs.result
@@ -50,7 +50,10 @@ show binary logs;
 Log_name	File_size
 master-bin.000002	371
 master-bin.000003	415
-purge master logs before now();
+select @time_for_purge:=DATE_ADD(UPDATE_TIME, INTERVAL 1 SECOND)
+from information_schema.tables
+where TABLE_SCHEMA="test" and TABLE_NAME="t2";
+purge master logs before (@time_for_purge);
 show binary logs;
 Log_name	File_size
 master-bin.000003	415
diff --git a/mysql-test/t/rpl_rotate_logs.test b/mysql-test/t/rpl_rotate_logs.test
index 027747665a3..37248746c19 100644
--- a/mysql-test/t/rpl_rotate_logs.test
+++ b/mysql-test/t/rpl_rotate_logs.test
@@ -110,9 +110,18 @@ show master logs;
 # we just tests if synonyms are accepted
 purge binary logs to 'master-bin.000002';
 show binary logs;
-# sleeping 10 seconds or more would make the slave believe connection is down
---real_sleep 1
-purge master logs before now();
+
+# Calculate time to use in "purge master logs before" by taking
+# last modification time of t2 and adding 1 second
+# This is donw in order to handle the case where file system
+# time differs from mysqld's time
+--disable_result_log
+select @time_for_purge:=DATE_ADD(UPDATE_TIME, INTERVAL 1 SECOND)
+  from information_schema.tables
+    where TABLE_SCHEMA="test" and TABLE_NAME="t2";
+--enable_result_log
+
+purge master logs before (@time_for_purge);
 show binary logs;
 insert into t2 values (65);
 sync_slave_with_master;