bzr push into mysql-5.1-bugteam branch (zhou.li:2840)

[Leonard Zhou]

 2840 Leonard Zhou	2009-03-18 [merge]
      Merge
modified:
  client/mysqldump.c
  config/ac-macros/ha_ndbcluster.m4
  config/ac-macros/plugins.m4
  include/my_sys.h
  mysql-test/include/concurrent.inc
  mysql-test/include/ndb_backup.inc
  mysql-test/r/concurrent_innodb_safelog.result
  mysql-test/r/concurrent_innodb_unsafelog.result
  mysql-test/r/create.result
  mysql-test/r/information_schema.result
  mysql-test/r/key_cache.result
  mysql-test/r/mysqldump.result
  mysql-test/r/select.result
  mysql-test/r/variables.result
  mysql-test/suite/binlog/r/binlog_auto_increment_bug33029.result
  mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
  mysql-test/suite/funcs_1/r/is_columns_mysql.result
  mysql-test/suite/ndb/r/ndb_restore.result
  mysql-test/suite/ndb/r/ndb_restore_partition.result
  mysql-test/suite/ndb/r/ndb_restore_print.result
  mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result
  mysql-test/suite/parts/r/ndb_dd_backuprestore.result
  mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result
  mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result
  mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result
  mysql-test/suite/sys_vars/r/concurrent_insert_basic.result
  mysql-test/suite/sys_vars/r/rpl_recovery_rank_basic_32.result
  mysql-test/suite/sys_vars/r/server_id_basic_32.result
  mysql-test/suite/sys_vars/r/server_id_basic_64.result
  mysql-test/t/information_schema.test
  mysql-test/t/mysqldump.test
  mysql-test/t/select.test
  mysql-test/t/variables.test
  mysys/default.c
  mysys/my_getopt.c
  server-tools/instance-manager/instance_map.cc
  server-tools/instance-manager/options.cc
  server-tools/instance-manager/options.h
  sql-common/client.c
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/set_var.cc
  sql/sql_plugin.cc
  sql/sql_select.cc
  sql/sql_show.cc

=== modified file 'mysql-test/suite/rpl/r/rpl_rotate_logs.result'
--- a/mysql-test/suite/rpl/r/rpl_rotate_logs.result	2009-03-11 15:19:18 +0000
+++ b/mysql-test/suite/rpl/r/rpl_rotate_logs.result	2009-03-12 09:48:41 +0000
@@ -87,9 +87,7 @@ show binary logs;
 Log_name	File_size
 master-bin.000002	#
 master-bin.000003	#
-select @time_for_purge:=DATE_ADD(UPDATE_TIME, INTERVAL 1 SECOND)
-from information_schema.tables
-where TABLE_SCHEMA="test" and TABLE_NAME="t2";
+SELECT @time_for_purge:=DATE_ADD('tmpval', INTERVAL 1 SECOND);
 purge master logs before (@time_for_purge);
 show binary logs;
 Log_name	File_size

=== modified file 'mysql-test/suite/rpl/t/rpl_rotate_logs.test'
--- a/mysql-test/suite/rpl/t/rpl_rotate_logs.test	2009-03-11 15:19:18 +0000
+++ b/mysql-test/suite/rpl/t/rpl_rotate_logs.test	2009-03-12 09:48:41 +0000
@@ -112,14 +112,24 @@ source include/show_master_logs.inc;
 purge binary logs to 'master-bin.000002';
 source include/show_binary_logs.inc;
 
-# 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
+# Set the purge time 1 second after the last modify time of master-bin.000002.
+perl;
+open F, ">>".$ENV{'MYSQLTEST_VARDIR'}.'/tmp/rpl_rotate_logs.tmp' or die "Tmp file rpl_rotate_logs.tmp not found";
+my $binlogpath = $ENV{'MYSQLTEST_VARDIR'}.'/mysqld.1/data/master-bin.000002';
+my @array = stat($binlogpath);
+my $filemodifytime = $array[9];
+my @t = localtime $filemodifytime;
+my $modifytime = sprintf "%04u-%02u-%02u %02u:%02u:%02u",$t[5]+1900,$t[4]+1,$t[3],$t[2],$t[1],$t[0];
+printf F ("let \$tmpval = %s;",$modifytime);
+close F;
+EOF
+
+--source $MYSQLTEST_VARDIR/tmp/rpl_rotate_logs.tmp
+remove_file $MYSQLTEST_VARDIR/tmp/rpl_rotate_logs.tmp;
+
 --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";
+--replace_result $tmpval tmpval
+--eval SELECT @time_for_purge:=DATE_ADD('$tmpval', INTERVAL 1 SECOND)
 --enable_result_log
 
 purge master logs before (@time_for_purge);