bk commit into 5.1 tree (msvensson:1.2501)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-24 12:03:55+02:00, msvensson@stripped +2 -0
  Merge pilot.blaudden:/home/msvensson/mysql/bug27438/my50-bug27438
  into  pilot.blaudden:/home/msvensson/mysql/bug27438/my51-bug27438
  MERGE: 1.1810.2932.17

  mysql-test/r/rpl_rotate_logs.result@stripped, 2007-05-24 12:03:52+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.72.1.1

  mysql-test/t/rpl_rotate_logs.test@stripped, 2007-05-24 12:03:52+02:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.63.1.5

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/bug27438/my51-bug27438/RESYNC

--- 1.77/mysql-test/r/rpl_rotate_logs.result	2007-04-02 11:15:07 +02:00
+++ 1.78/mysql-test/r/rpl_rotate_logs.result	2007-05-24 12:03:52 +02:00
@@ -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

--- 1.69/mysql-test/t/rpl_rotate_logs.test	2007-01-22 16:37:24 +01:00
+++ 1.70/mysql-test/t/rpl_rotate_logs.test	2007-05-24 12:03:52 +02:00
@@ -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;