From a43992d78cb5115e2e6eeef623de44f91836922b Mon Sep 17 00:00:00 2001 From: Georgi Kodinov Date: Wed, 11 Mar 2009 17:19:18 +0200 Subject: [PATCH] Revert the push for bug #39858 --- mysql-test/suite/rpl/r/rpl_rotate_logs.result | 4 ++- mysql-test/suite/rpl/t/rpl_rotate_logs.test | 31 +++++-------------- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_rotate_logs.result b/mysql-test/suite/rpl/r/rpl_rotate_logs.result index 013ba87ec0b..6314a9a61fb 100644 --- a/mysql-test/suite/rpl/r/rpl_rotate_logs.result +++ b/mysql-test/suite/rpl/r/rpl_rotate_logs.result @@ -87,7 +87,9 @@ show binary logs; Log_name File_size master-bin.000002 # master-bin.000003 # -SELECT @time_for_purge:=DATE_ADD('tmpval', INTERVAL 1 SECOND); +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 diff --git a/mysql-test/suite/rpl/t/rpl_rotate_logs.test b/mysql-test/suite/rpl/t/rpl_rotate_logs.test index 6fc09c93fe6..2bad7b27272 100644 --- a/mysql-test/suite/rpl/t/rpl_rotate_logs.test +++ b/mysql-test/suite/rpl/t/rpl_rotate_logs.test @@ -112,31 +112,14 @@ source include/show_master_logs.inc; purge binary logs to 'master-bin.000002'; source include/show_binary_logs.inc; -# Set the purge time 1 second after the last modify time of master-bin.000002. -let $MYSQLD_DATADIR= `select @@datadir`; ---exec stat $MYSQLD_DATADIR/master-bin.000002 >$MYSQLTEST_VARDIR/tmp/rpl_rotate_logs.000002 ---exec echo > $MYSQLTEST_VARDIR/tmp/rpl_rotate_logs.tmp -perl; -open F, $ENV{'MYSQLTEST_VARDIR'}.'/tmp/rpl_rotate_logs.000002' or die "Tmp file rpl_rotate_logs.000002 not found"; -open F2, ">>".$ENV{'MYSQLTEST_VARDIR'}.'/tmp/rpl_rotate_logs.tmp' or die "Tmp file rpl_rotate_logs.tmp not found"; -while () -{ - if (/Modify: ([^ ]*) ([^ ]*)\./) - { - printf F2 ("let \$tmpval = %s %s;",$1,$2); - } -} -close F; -close F2; -EOF - ---source $MYSQLTEST_VARDIR/tmp/rpl_rotate_logs.tmp -remove_file $MYSQLTEST_VARDIR/tmp/rpl_rotate_logs.000002; -remove_file $MYSQLTEST_VARDIR/tmp/rpl_rotate_logs.tmp; - +# 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 ---replace_result $tmpval tmpval ---eval SELECT @time_for_purge:=DATE_ADD('$tmpval', INTERVAL 1 SECOND) +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);