MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Chuck Bell Date:January 25 2010 2:47pm
Subject:bzr commit into mysql-6.0-codebase branch (charles.bell:3845) Bug#50536
View as plain text  
#At file:///Users/cbell/source/bzr/mysql-6.0-codebase-bugfixing/ based on revid:jon.hauglid@stripped

 3845 Chuck Bell	2010-01-25
      BUG#50536 (backup_ptr* test fails)
      The test failed because of prefixed date 2010-01-21 which has become past.
      This patch will fix the failing test and replace the datetime to
      future date. The test will use this date to binlog recovery of data 
      before and after backup.

    modified:
      mysql-test/suite/backup_ptr/r/backup_ptr.result
      mysql-test/suite/backup_ptr/r/backup_ptr_commits.result
      mysql-test/suite/backup_ptr/r/backup_ptr_objects.result
      mysql-test/suite/backup_ptr/t/backup_ptr.test
      mysql-test/suite/backup_ptr/t/backup_ptr_commits.test
      mysql-test/suite/backup_ptr/t/backup_ptr_objects.test
=== modified file 'mysql-test/suite/backup_ptr/r/backup_ptr.result'
--- a/mysql-test/suite/backup_ptr/r/backup_ptr.result	2010-01-12 01:48:52 +0000
+++ b/mysql-test/suite/backup_ptr/r/backup_ptr.result	2010-01-25 14:47:24 +0000
@@ -4,7 +4,7 @@ RESET MASTER;
 This test will recover data using binlog position
 till point of backup and after backup.
 
-SET @a=UNIX_TIMESTAMP("2010-01-21 15:32:22");
+SET @a=UNIX_TIMESTAMP("2015-01-21 15:32:22");
 SET timestamp=@a;
 CREATE DATABASE IF NOT EXISTS ptr;
 USE ptr;

=== modified file 'mysql-test/suite/backup_ptr/r/backup_ptr_commits.result'
--- a/mysql-test/suite/backup_ptr/r/backup_ptr_commits.result	2009-05-21 13:17:37 +0000
+++ b/mysql-test/suite/backup_ptr/r/backup_ptr_commits.result	2010-01-25 14:47:24 +0000
@@ -5,7 +5,7 @@ This test will recover data that were co
 operation. This is acheived by means of debug_sync points
 which pauses the backup database operation during commit.
 
-SET @a=UNIX_TIMESTAMP("2010-01-21 15:32:22");
+SET @a=UNIX_TIMESTAMP("2015-01-21 15:32:22");
 SET timestamp=@a;
 SET DEBUG_SYNC= 'RESET';
 CREATE DATABASE IF NOT EXISTS ptr;

=== modified file 'mysql-test/suite/backup_ptr/r/backup_ptr_objects.result'
--- a/mysql-test/suite/backup_ptr/r/backup_ptr_objects.result	2010-01-14 00:22:59 +0000
+++ b/mysql-test/suite/backup_ptr/r/backup_ptr_objects.result	2010-01-25 14:47:24 +0000
@@ -5,7 +5,7 @@ RESET MASTER;
 This test will recover data and objects using binlog position
 till point of backup and after backup.
 
-SET @a=UNIX_TIMESTAMP("2010-01-21 15:32:22");
+SET @a=UNIX_TIMESTAMP("2015-01-21 15:32:22");
 SET timestamp=@a;
 DROP DATABASE IF EXISTS ptr_ob1;
 DROP DATABASE IF EXISTS ptr_ob2;

=== modified file 'mysql-test/suite/backup_ptr/t/backup_ptr.test'
--- a/mysql-test/suite/backup_ptr/t/backup_ptr.test	2009-05-21 13:17:37 +0000
+++ b/mysql-test/suite/backup_ptr/t/backup_ptr.test	2010-01-25 14:47:24 +0000
@@ -26,7 +26,7 @@ RESET MASTER;
 --echo
 
 #We set constant timestamp inside the test.
-SET @a=UNIX_TIMESTAMP("2010-01-21 15:32:22");
+SET @a=UNIX_TIMESTAMP("2015-01-21 15:32:22");
 SET timestamp=@a;
 
 # Create database
@@ -283,7 +283,7 @@ DROP DATABASE ptr;
 
 --echo  Now use binlog dates to recover the data till point of backup.
 
---exec $MYSQL_BINLOG --database=ptr --start-datetime="2010-01-21 15:32:22" --stop-datetime="2010-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
+--exec $MYSQL_BINLOG --database=ptr --start-datetime="2015-01-21 15:32:22" --stop-datetime="2015-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
 
 SELECT * FROM ptr.t1;
 SELECT * FROM ptr.t2 ORDER BY id;
@@ -293,7 +293,7 @@ SELECT * FROM ptr.d2;
 
 --echo We execute binlog to recover data after backup using binlog dates.
 
---exec $MYSQL_BINLOG --database=ptr --start-datetime="2010-01-21 15:32:24" --stop-datetime="2010-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
+--exec $MYSQL_BINLOG --database=ptr --start-datetime="2015-01-21 15:32:24" --stop-datetime="2015-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
 SHOW TABLES FROM ptr;
 
 DESCRIBE ptr.t1;
@@ -324,7 +324,7 @@ SELECT * FROM ptr.t3;
 SELECT * FROM ptr.d1;
 SELECT * FROM ptr.d2;
 
---exec $MYSQL_BINLOG --database=ptr --start-datetime="2010-01-21 15:32:24" --stop-datetime="2010-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
+--exec $MYSQL_BINLOG --database=ptr --start-datetime="2015-01-21 15:32:24" --stop-datetime="2015-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
 
 SHOW DATABASES;
 SHOW TABLES FROM ptr;
@@ -364,7 +364,7 @@ DROP DATABASE ptr;
 --echo Do complete recovery of data after backup using binlog dates. Ensure
 --echo that presence of backup operation in the binlog shouldn't have any impact
 
---exec $MYSQL_BINLOG --database=ptr --start-datetime="2010-01-21 15:32:22" --stop-datetime="2010-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
+--exec $MYSQL_BINLOG --database=ptr --start-datetime="2015-01-21 15:32:22" --stop-datetime="2015-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
 
 SHOW DATABASES;
 SHOW TABLES FROM ptr;

=== modified file 'mysql-test/suite/backup_ptr/t/backup_ptr_commits.test'
--- a/mysql-test/suite/backup_ptr/t/backup_ptr_commits.test	2009-05-21 13:17:37 +0000
+++ b/mysql-test/suite/backup_ptr/t/backup_ptr_commits.test	2010-01-25 14:47:24 +0000
@@ -34,7 +34,7 @@ connection con1;
 --echo
 
 #We set constant timestamp inside the test.
-SET @a=UNIX_TIMESTAMP("2010-01-21 15:32:22");
+SET @a=UNIX_TIMESTAMP("2015-01-21 15:32:22");
 SET timestamp=@a;
 
 --disable_warnings
@@ -184,7 +184,7 @@ DROP DATABASE ptr;
 --echo 
 
 --echo use binlog dates to recover data till backup.
---exec $MYSQL_BINLOG --start-datetime="2010-01-21 15:32:22" --stop-datetime="2010-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
+--exec $MYSQL_BINLOG --start-datetime="2015-01-21 15:32:22" --stop-datetime="2015-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
 
 SHOW TABLES FROM ptr;
 SELECT * FROM ptr.t1;
@@ -192,7 +192,7 @@ SELECT * FROM ptr.t2;
 SELECT * FROM ptr.t3;
 
 --echo use binlog dates to recover data after backup.
---exec $MYSQL_BINLOG --start-datetime="2010-01-21 15:32:24" --stop-datetime="2010-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
+--exec $MYSQL_BINLOG --start-datetime="2015-01-21 15:32:24" --stop-datetime="2015-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
 --echo *** Now recover data after backup using binlog dates ***
 
 SELECT * FROM ptr.t1;
@@ -211,7 +211,7 @@ SELECT * FROM ptr.t1;
 SELECT * FROM ptr.t2;
 SELECT * FROM ptr.t3;
 
---exec $MYSQL_BINLOG --start-datetime="2010-01-21 15:32:24" --stop-datetime="2010-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
+--exec $MYSQL_BINLOG --start-datetime="2015-01-21 15:32:24" --stop-datetime="2015-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
 --echo *** Now recover data after backup using binlog dates ***
 
 SELECT * FROM ptr.t1;

=== modified file 'mysql-test/suite/backup_ptr/t/backup_ptr_objects.test'
--- a/mysql-test/suite/backup_ptr/t/backup_ptr_objects.test	2010-01-14 00:22:59 +0000
+++ b/mysql-test/suite/backup_ptr/t/backup_ptr_objects.test	2010-01-25 14:47:24 +0000
@@ -28,7 +28,7 @@ RESET MASTER;
 --echo
 
 #We set constant timestamp inside the test.
-SET @a=UNIX_TIMESTAMP("2010-01-21 15:32:22");
+SET @a=UNIX_TIMESTAMP("2015-01-21 15:32:22");
 SET timestamp=@a;
 
 #
@@ -487,7 +487,7 @@ DROP DATABASE ptr_ob2;
 --echo
 
 --echo Use mysqlbinlog dates to recover data till point of backup.
---exec $MYSQL_BINLOG --start-datetime="2010-01-21 15:32:22" --stop-datetime="2010-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
+--exec $MYSQL_BINLOG --start-datetime="2015-01-21 15:32:22" --stop-datetime="2015-01-21 15:32:24" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
 
 --replace_column 5 # 6 # 9 # 10 # 11 #
 SHOW PROCEDURE STATUS WHERE Db LIKE 'ptr_%';
@@ -509,7 +509,7 @@ SELECT * FROM ptr_ob1.vv;
 SELECT ptr_ob1.f1();
 
 --echo Use mysqlbinlog dates to recover data after backup 
---exec $MYSQL_BINLOG --start-datetime="2010-01-21 15:32:24" --stop-datetime="2010-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
+--exec $MYSQL_BINLOG --start-datetime="2015-01-21 15:32:24" --stop-datetime="2015-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
 
 --replace_column 5 # 6 # 9 # 10 # 11 #
 SHOW PROCEDURE STATUS WHERE Db LIKE 'ptr_%';
@@ -563,7 +563,7 @@ SELECT * FROM ptr_ob1.vv;
 SELECT ptr_ob1.f1();
 
 --echo use binlog dates to recover data after backup.
---exec $MYSQL_BINLOG --start-datetime="2010-01-21 15:32:24" --stop-datetime="2010-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
+--exec $MYSQL_BINLOG --start-datetime="2015-01-21 15:32:24" --stop-datetime="2015-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
 
 --replace_column 5 # 6 # 9 # 10 # 11 #
 SHOW PROCEDURE STATUS WHERE Db LIKE 'ptr_%';
@@ -621,7 +621,7 @@ DROP DATABASE ptr_ob2;
 --echo Do complete recovery of data after backup using binlog dates. Ensure
 --echo that presence of backup operation in the binlog shouldn't have any impact
 
---exec $MYSQL_BINLOG --start-datetime="2010-01-21 15:32:22" --stop-datetime="2010-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
+--exec $MYSQL_BINLOG --start-datetime="2015-01-21 15:32:22" --stop-datetime="2015-01-21 15:32:26" $MYSQLD_DATADIR/master-bin.000001 |$MYSQL
 
 --replace_column 5 # 6 # 9 # 10 # 11 #
 SHOW PROCEDURE STATUS WHERE Db LIKE 'ptr_%';


Attachment: [text/bzr-bundle] bzr/charles.bell@sun.com-20100125144724-stb6673e038jdxni.bundle
Thread
bzr commit into mysql-6.0-codebase branch (charles.bell:3845) Bug#50536Chuck Bell25 Jan