MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Chuck Bell Date:January 22 2010 8:32pm
Subject:bzr commit into mysql-backup-backport branch (charles.bell:3072)
Bug#50536
View as plain text  
#At file:///home/cbell/source/bzr/MS10/ based on revid:charles.bell@stripped

 3072 Chuck Bell	2010-01-22
      BUG#50536 (backup_ptr* test fails)
      
      original changeset: 2938 (mysql-6.0-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-06 15:03:50 +0000
+++ b/mysql-test/suite/backup_ptr/r/backup_ptr.result	2010-01-22 20:32:20 +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	2010-01-06 15:03:50 +0000
+++ b/mysql-test/suite/backup_ptr/r/backup_ptr_commits.result	2010-01-22 20:32:20 +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-06 15:03:50 +0000
+++ b/mysql-test/suite/backup_ptr/r/backup_ptr_objects.result	2010-01-22 20:32:20 +0000
@@ -4,7 +4,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	2010-01-06 15:03:50 +0000
+++ b/mysql-test/suite/backup_ptr/t/backup_ptr.test	2010-01-22 20:32:20 +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	2010-01-06 15:03:50 +0000
+++ b/mysql-test/suite/backup_ptr/t/backup_ptr_commits.test	2010-01-22 20:32:20 +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-06 15:03:50 +0000
+++ b/mysql-test/suite/backup_ptr/t/backup_ptr_objects.test	2010-01-22 20:32:20 +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;
 
 #
@@ -485,7 +485,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_%';
@@ -507,7 +507,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_%';
@@ -561,7 +561,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_%';
@@ -619,7 +619,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-20100122203220-de7byonnd8tst24h.bundle
Thread
bzr commit into mysql-backup-backport branch (charles.bell:3072)Bug#50536Chuck Bell22 Jan