List:Commits« Previous MessageNext Message »
From:Rafal Somla Date:January 29 2009 10:20am
Subject:bzr push into mysql-6.0-rpl branch (Rafal.Somla:2803 to 2804)
View as plain text  
 2804 Rafal Somla	2009-01-29
      Removing non-determinism from backup_vp_* tests.
      
      In these tests data is inserted into table by threads executing
      in parallel and thus the order of rows in the table can be 
      non-deterministic. This made test fail sometimes.
      
      This patch fixes the order in which table contents is shown in 
      result file by adding ORDER BY clauses to SELECT statements.
modified:
  mysql-test/suite/backup/r/backup_vp_nontx.result
  mysql-test/suite/backup/r/backup_vp_tx.result
  mysql-test/suite/backup/t/backup_vp_nontx.test
  mysql-test/suite/backup/t/backup_vp_tx.test

 2803 Serge Kozlov	2009-01-29
      Bug#32654. Re-enabled
modified:
  mysql-test/suite/rpl/t/disabled.def

=== modified file 'mysql-test/suite/backup/r/backup_vp_nontx.result'
--- a/mysql-test/suite/backup/r/backup_vp_nontx.result	2008-11-20 09:49:34 +0000
+++ b/mysql-test/suite/backup/r/backup_vp_nontx.result	2009-01-29 10:19:15 +0000
@@ -15,7 +15,7 @@ INSERT INTO bup_vp.t1 VALUES ("04 Some d
 INSERT INTO bup_vp.t1 VALUES ("05 Some data to test");
 
 con_bup: Show the data before we start backup
-SELECT * FROM bup_vp.t1;
+SELECT * FROM bup_vp.t1 ORDER BY col_a;
 col_a
 01 Some data to test
 02 Some data to test
@@ -71,7 +71,7 @@ backup_id
 #
 
 con_bup: Showing data after updates and backup
-SELECT * FROM bup_vp.t1;
+SELECT * FROM bup_vp.t1  ORDER BY col_a;
 col_a
 01 Some data to test
 02 Some data to test
@@ -79,8 +79,8 @@ col_a
 04 Some data to test
 05 Some data to test
 ntx1: 06 Some data to test
-ntx2: Should NOT be in backup
 ntx1: Should NOT be in backup
+ntx2: Should NOT be in backup
 con_bup: Dropping the database
 DROP TABLE bup_vp.t1;
 DROP DATABASE bup_vp;
@@ -90,7 +90,7 @@ backup_id
 #
 
 con_bup: Showing the data after restore
-SELECT * FROM bup_vp.t1;
+SELECT * FROM bup_vp.t1  ORDER BY col_a;
 col_a
 01 Some data to test
 02 Some data to test

=== modified file 'mysql-test/suite/backup/r/backup_vp_tx.result'
--- a/mysql-test/suite/backup/r/backup_vp_tx.result	2008-11-20 09:49:34 +0000
+++ b/mysql-test/suite/backup/r/backup_vp_tx.result	2009-01-29 10:19:15 +0000
@@ -28,21 +28,21 @@ INSERT INTO bup_vp.t3 VALUES ("04 Some d
 INSERT INTO bup_vp.t3 VALUES ("05 Some data to test");
 
 con_bup: Show the data before we start backup
-SELECT * FROM bup_vp.t1;
+SELECT * FROM bup_vp.t1  ORDER BY col_a;
 col_a
 01 Some data to test
 02 Some data to test
 03 Some data to test
 04 Some data to test
 05 Some data to test
-SELECT * FROM bup_vp.t2;
+SELECT * FROM bup_vp.t2  ORDER BY col_a;
 col_a
 01 Some data to test
 02 Some data to test
 03 Some data to test
 04 Some data to test
 05 Some data to test
-SELECT * FROM bup_vp.t3;
+SELECT * FROM bup_vp.t3  ORDER BY col_a;
 col_a
 01 Some data to test
 02 Some data to test
@@ -125,7 +125,7 @@ backup_id
 #
 
 con_bup: Showing data after updates and backup
-SELECT * FROM bup_vp.t1;
+SELECT * FROM bup_vp.t1  ORDER BY col_a;
 col_a
 01 Some data to test
 02 Some data to test
@@ -133,7 +133,7 @@ col_a
 04 Some data to test
 05 Some data to test
 tx1: 06 Some data to test
-SELECT * FROM bup_vp.t2;
+SELECT * FROM bup_vp.t2  ORDER BY col_a;
 col_a
 01 Some data to test
 02 Some data to test
@@ -141,7 +141,7 @@ col_a
 04 Some data to test
 05 Some data to test
 tx2: 06 Should NOT be in backup
-SELECT * FROM bup_vp.t3;
+SELECT * FROM bup_vp.t3  ORDER BY col_a;
 col_a
 01 Some data to test
 02 Some data to test
@@ -160,7 +160,7 @@ backup_id
 #
 
 con_bup: Showing the data after restore (tx2 and tx3 should not be there)
-SELECT * FROM bup_vp.t1;
+SELECT * FROM bup_vp.t1  ORDER BY col_a;
 col_a
 01 Some data to test
 02 Some data to test
@@ -168,14 +168,14 @@ col_a
 04 Some data to test
 05 Some data to test
 tx1: 06 Some data to test
-SELECT * FROM bup_vp.t2;
+SELECT * FROM bup_vp.t2  ORDER BY col_a;
 col_a
 01 Some data to test
 02 Some data to test
 03 Some data to test
 04 Some data to test
 05 Some data to test
-SELECT * FROM bup_vp.t3;
+SELECT * FROM bup_vp.t3  ORDER BY col_a;
 col_a
 01 Some data to test
 02 Some data to test

=== modified file 'mysql-test/suite/backup/t/backup_vp_nontx.test'
--- a/mysql-test/suite/backup/t/backup_vp_nontx.test	2008-11-20 09:49:34 +0000
+++ b/mysql-test/suite/backup/t/backup_vp_nontx.test	2009-01-29 10:19:15 +0000
@@ -102,7 +102,7 @@ INSERT INTO bup_vp.t1 VALUES ("05 Some d
 
 --echo 
 --echo con_bup: Show the data before we start backup
-SELECT * FROM bup_vp.t1;
+SELECT * FROM bup_vp.t1 ORDER BY col_a;
 
 ### CON 1 ###
   --echo 
@@ -223,7 +223,7 @@ reap;
 # Do selects to show that all changes got applied.
 --echo 
 --echo con_bup: Showing data after updates and backup
-SELECT * FROM bup_vp.t1;
+SELECT * FROM bup_vp.t1  ORDER BY col_a;
 
 --echo con_bup: Dropping the database
 DROP TABLE bup_vp.t1;
@@ -235,7 +235,7 @@ RESTORE FROM "bup_vp.bak";
 
 --echo 
 --echo con_bup: Showing the data after restore
-SELECT * FROM bup_vp.t1;
+SELECT * FROM bup_vp.t1  ORDER BY col_a;
 
 --echo
 --echo Verifying results:

=== modified file 'mysql-test/suite/backup/t/backup_vp_tx.test'
--- a/mysql-test/suite/backup/t/backup_vp_tx.test	2008-11-20 09:49:34 +0000
+++ b/mysql-test/suite/backup/t/backup_vp_tx.test	2009-01-29 10:19:15 +0000
@@ -127,9 +127,9 @@ INSERT INTO bup_vp.t3 VALUES ("05 Some d
 
 --echo 
 --echo con_bup: Show the data before we start backup
-SELECT * FROM bup_vp.t1;
-SELECT * FROM bup_vp.t2;
-SELECT * FROM bup_vp.t3;
+SELECT * FROM bup_vp.t1  ORDER BY col_a;
+SELECT * FROM bup_vp.t2  ORDER BY col_a;
+SELECT * FROM bup_vp.t3  ORDER BY col_a;
 
 ### CON 3 ###
       --echo 
@@ -286,9 +286,9 @@ reap;
 # Do selects to show that all changes got applied.
 --echo 
 --echo con_bup: Showing data after updates and backup
-SELECT * FROM bup_vp.t1;
-SELECT * FROM bup_vp.t2;
-SELECT * FROM bup_vp.t3;
+SELECT * FROM bup_vp.t1  ORDER BY col_a;
+SELECT * FROM bup_vp.t2  ORDER BY col_a;
+SELECT * FROM bup_vp.t3  ORDER BY col_a;
 
 --echo con_bup: Dropping the database
 DROP TABLE bup_vp.t1;
@@ -302,9 +302,9 @@ RESTORE FROM "bup_vp.bak";
 
 --echo 
 --echo con_bup: Showing the data after restore (tx2 and tx3 should not be there)
-SELECT * FROM bup_vp.t1;
-SELECT * FROM bup_vp.t2;
-SELECT * FROM bup_vp.t3;
+SELECT * FROM bup_vp.t1  ORDER BY col_a;
+SELECT * FROM bup_vp.t2  ORDER BY col_a;
+SELECT * FROM bup_vp.t3  ORDER BY col_a;
 
 --echo
 --echo Verifying results:

Thread
bzr push into mysql-6.0-rpl branch (Rafal.Somla:2803 to 2804)Rafal Somla29 Jan