#At file:///localhome/jl208045/mysql/mysql-6.0-backup-review1/ based on revid:ingo.struewing@stripped
2800 Jorgen Loland 2009-05-04
BUG#44605 - The test backup_dbname_lctn2 is failing in backup tree
The fix for BUG 43220 revealed a bug in this test. The new result file contains the correct content of the restored tables on file systems with only lower case file names.
@ mysql-test/suite/backup/r/backup_dbname_lctn1.result
Added ordering of selects to make the test deterministic
@ mysql-test/suite/backup/r/backup_dbname_lctn2.result
Added ordering of selects to make the test deterministic and recorded correct content of restored tables
@ mysql-test/suite/backup/t/backup_dbname_lctn1.test
Added ordering of selects to make the test deterministic
modified:
mysql-test/suite/backup/r/backup_dbname_lctn1.result
mysql-test/suite/backup/r/backup_dbname_lctn2.result
mysql-test/suite/backup/t/backup_dbname_lctn1.test
=== modified file 'mysql-test/suite/backup/r/backup_dbname_lctn1.result'
--- a/mysql-test/suite/backup/r/backup_dbname_lctn1.result 2009-03-18 22:01:12 +0000
+++ b/mysql-test/suite/backup/r/backup_dbname_lctn1.result 2009-05-04 08:42:32 +0000
@@ -58,13 +58,13 @@ lower
SHOW TABLES IN lower;
Tables_in_lower
lcase
-SELECT * FROM lower.lcase;
+SELECT * FROM lower.lcase ORDER BY b;
a b
-L41 1300
-L01 1453
L00 1000
+L41 1300
L41 1301
L41 1305
+L01 1453
#
# Upper case database:
#
@@ -74,13 +74,13 @@ upper
SHOW TABLES IN UPPER;
Tables_in_upper
ucase
-SELECT * FROM UPPER.ucase;
+SELECT * FROM UPPER.ucase ORDER BY b;
a b
-U41 1300
-U01 1453
U00 1000
+U41 1300
U41 1301
U41 1305
+U01 1453
#
# Drop the databases
#
@@ -103,13 +103,13 @@ lower
SHOW TABLES IN lower;
Tables_in_lower
lcase
-SELECT * FROM lower.lcase;
+SELECT * FROM lower.lcase ORDER BY b;
a b
-L41 1300
-L01 1453
L00 1000
+L41 1300
L41 1301
L41 1305
+L01 1453
#
# RESTORE upper case database and verify content
#
@@ -123,13 +123,13 @@ upper
SHOW TABLES IN UPPER;
Tables_in_upper
ucase
-SELECT * FROM UPPER.ucase;
+SELECT * FROM UPPER.ucase ORDER BY b;
a b
-U41 1300
-U01 1453
U00 1000
+U41 1300
U41 1301
U41 1305
+U01 1453
#
# Drop the databases
#
@@ -152,13 +152,13 @@ lower
SHOW TABLES IN lower;
Tables_in_lower
lcase
-SELECT * FROM lower.lcase;
+SELECT * FROM lower.lcase ORDER BY b;
a b
-L41 1300
-L01 1453
L00 1000
+L41 1300
L41 1301
L41 1305
+L01 1453
#
# RESTORE upper case database and verify content
#
@@ -172,13 +172,13 @@ upper
SHOW TABLES IN UPPER;
Tables_in_upper
ucase
-SELECT * FROM UPPER.ucase;
+SELECT * FROM UPPER.ucase ORDER BY b;
a b
-U41 1300
-U01 1453
U00 1000
+U41 1300
U41 1301
U41 1305
+U01 1453
#
# Drop the databases
#
@@ -199,13 +199,13 @@ lower
SHOW TABLES IN lower;
Tables_in_lower
lcase
-SELECT * FROM lower.lcase;
+SELECT * FROM lower.lcase ORDER BY b;
a b
-L41 1300
-L01 1453
L00 1000
+L41 1300
L41 1301
L41 1305
+L01 1453
SHOW DATABASES WHERE `Database` LIKE 'UPPER';
Database
@@ -213,13 +213,13 @@ upper
SHOW TABLES IN UPPER;
Tables_in_upper
ucase
-SELECT * FROM UPPER.ucase;
+SELECT * FROM UPPER.ucase ORDER BY b;
a b
-U41 1300
-U01 1453
U00 1000
+U41 1300
U41 1301
U41 1305
+U01 1453
#
# Verify that BACKUP errors if the same database is written twice,
# but with different case
=== modified file 'mysql-test/suite/backup/r/backup_dbname_lctn2.result'
--- a/mysql-test/suite/backup/r/backup_dbname_lctn2.result 2009-03-18 22:01:12 +0000
+++ b/mysql-test/suite/backup/r/backup_dbname_lctn2.result 2009-05-04 08:42:32 +0000
@@ -58,13 +58,13 @@ lower
SHOW TABLES IN lower;
Tables_in_lower
lcase
-SELECT * FROM lower.lcase;
+SELECT * FROM lower.lcase ORDER BY b;
a b
-L41 1300
-L01 1453
L00 1000
+L41 1300
L41 1301
L41 1305
+L01 1453
#
# Upper case database:
#
@@ -74,13 +74,13 @@ UPPER
SHOW TABLES IN UPPER;
Tables_in_upper
ucase
-SELECT * FROM UPPER.ucase;
+SELECT * FROM UPPER.ucase ORDER BY b;
a b
-U41 1300
-U01 1453
U00 1000
+U41 1300
U41 1301
U41 1305
+U01 1453
#
# Drop the databases
#
@@ -103,13 +103,13 @@ lower
SHOW TABLES IN lower;
Tables_in_lower
lcase
-SELECT * FROM lower.lcase;
+SELECT * FROM lower.lcase ORDER BY b;
a b
-L41 1300
-L01 1453
L00 1000
+L41 1300
L41 1301
L41 1305
+L01 1453
#
# RESTORE upper case database and verify content
#
@@ -123,8 +123,13 @@ UPPER
SHOW TABLES IN UPPER;
Tables_in_upper
ucase
-SELECT * FROM UPPER.ucase;
+SELECT * FROM UPPER.ucase ORDER BY b;
a b
+U00 1000
+U41 1300
+U41 1301
+U41 1305
+U01 1453
#
# Drop the databases
#
@@ -147,13 +152,13 @@ lower
SHOW TABLES IN lower;
Tables_in_lower
lcase
-SELECT * FROM lower.lcase;
+SELECT * FROM lower.lcase ORDER BY b;
a b
-L41 1300
-L01 1453
L00 1000
+L41 1300
L41 1301
L41 1305
+L01 1453
#
# RESTORE upper case database and verify content
#
@@ -167,8 +172,13 @@ UPPER
SHOW TABLES IN UPPER;
Tables_in_upper
ucase
-SELECT * FROM UPPER.ucase;
+SELECT * FROM UPPER.ucase ORDER BY b;
a b
+U00 1000
+U41 1300
+U41 1301
+U41 1305
+U01 1453
#
# Drop the databases
#
@@ -189,13 +199,13 @@ lower
SHOW TABLES IN lower;
Tables_in_lower
lcase
-SELECT * FROM lower.lcase;
+SELECT * FROM lower.lcase ORDER BY b;
a b
-L41 1300
-L01 1453
L00 1000
+L41 1300
L41 1301
L41 1305
+L01 1453
SHOW DATABASES WHERE `Database` LIKE 'UPPER';
Database
@@ -203,8 +213,13 @@ UPPER
SHOW TABLES IN UPPER;
Tables_in_upper
ucase
-SELECT * FROM UPPER.ucase;
+SELECT * FROM UPPER.ucase ORDER BY b;
a b
+U00 1000
+U41 1300
+U41 1301
+U41 1305
+U01 1453
#
# Verify that BACKUP errors if the same database is written twice,
# but with different case
=== modified file 'mysql-test/suite/backup/t/backup_dbname_lctn1.test'
--- a/mysql-test/suite/backup/t/backup_dbname_lctn1.test 2009-03-18 22:01:12 +0000
+++ b/mysql-test/suite/backup/t/backup_dbname_lctn1.test 2009-05-04 08:42:32 +0000
@@ -70,7 +70,7 @@ BACKUP DATABASE upper, lower to 'bothcas
SHOW DATABASES WHERE `Database` LIKE 'lower';
SHOW TABLES IN lower;
-SELECT * FROM lower.lcase;
+SELECT * FROM lower.lcase ORDER BY b;
--echo #
--echo # Upper case database:
@@ -78,7 +78,7 @@ SELECT * FROM lower.lcase;
SHOW DATABASES WHERE `Database` LIKE 'UPPER';
SHOW TABLES IN UPPER;
-SELECT * FROM UPPER.ucase;
+SELECT * FROM UPPER.ucase ORDER BY b;
--echo #
--echo # Drop the databases
@@ -99,7 +99,7 @@ RESTORE FROM 'lowlow.bup';
--echo
SHOW DATABASES WHERE `Database` LIKE 'lower';
SHOW TABLES IN lower;
-SELECT * FROM lower.lcase;
+SELECT * FROM lower.lcase ORDER BY b;
--echo #
--echo # RESTORE upper case database and verify content
@@ -110,7 +110,7 @@ RESTORE FROM 'upup.bup';
--echo
SHOW DATABASES WHERE `Database` LIKE 'UPPER';
SHOW TABLES IN UPPER;
-SELECT * FROM UPPER.ucase;
+SELECT * FROM UPPER.ucase ORDER BY b;
--echo #
--echo # Drop the databases
@@ -131,7 +131,7 @@ RESTORE FROM 'lowup.bup';
--echo
SHOW DATABASES WHERE `Database` LIKE 'lower';
SHOW TABLES IN lower;
-SELECT * FROM lower.lcase;
+SELECT * FROM lower.lcase ORDER BY b;
--echo #
--echo # RESTORE upper case database and verify content
@@ -142,7 +142,7 @@ RESTORE FROM 'uplow.bup';
--echo
SHOW DATABASES WHERE `Database` LIKE 'UPPER';
SHOW TABLES IN UPPER;
-SELECT * FROM UPPER.ucase;
+SELECT * FROM UPPER.ucase ORDER BY b;
--echo #
--echo # Drop the databases
@@ -161,12 +161,12 @@ RESTORE FROM 'bothcases.bup';
--echo
SHOW DATABASES WHERE `Database` LIKE 'lower';
SHOW TABLES IN lower;
-SELECT * FROM lower.lcase;
+SELECT * FROM lower.lcase ORDER BY b;
--echo
SHOW DATABASES WHERE `Database` LIKE 'UPPER';
SHOW TABLES IN UPPER;
-SELECT * FROM UPPER.ucase;
+SELECT * FROM UPPER.ucase ORDER BY b;
--echo #
--echo # Verify that BACKUP errors if the same database is written twice,
Attachment: [text/bzr-bundle] bzr/jorgen.loland@sun.com-20090504084232-31nanik2r45j6yu0.bundle
