#At file:///media/sda3/work/mysql/bzrwork/merge/6.0-rpl/
2684 He Zhenxing 2008-09-02
Fix backup test failures
modified:
mysql-test/suite/backup/combinations
mysql-test/suite/backup/r/backup_functions.result
mysql-test/suite/backup/r/backup_procedures.result
mysql-test/suite/backup/t/backup_functions.test
mysql-test/suite/backup/t/backup_procedures.test
=== modified file 'mysql-test/suite/backup/combinations'
--- a/mysql-test/suite/backup/combinations 2008-08-12 03:22:05 +0000
+++ b/mysql-test/suite/backup/combinations 2008-09-02 14:04:39 +0000
@@ -8,4 +8,5 @@
--default-storage-engine=memory
[innodb]
+--innodb=1
--default-storage-engine=innodb
=== modified file 'mysql-test/suite/backup/r/backup_functions.result'
--- a/mysql-test/suite/backup/r/backup_functions.result 2008-08-12 03:22:05 +0000
+++ b/mysql-test/suite/backup/r/backup_functions.result 2008-09-02 14:04:39 +0000
@@ -126,7 +126,7 @@ paymentno int(11) NO PRI NULL
playerno int(11) YES MUL NULL
paymentdate date YES NULL
amount float YES NULL
-SHOW FUNCTION STATUS;;
+SHOW FUNCTION STATUS WHERE Db <> 'mtr';;
Db bup_sfs
Name dollars
Type FUNCTION
@@ -222,7 +222,7 @@ teamno int(11) YES MUL NULL
playerno int(11) YES MUL NULL
won int(11) YES NULL
lost int(11) YES NULL
-SHOW FUNCTION STATUS;;
+SHOW FUNCTION STATUS WHERE Db <> 'mtr';;
Db bup_sfs
Name dollars
Type FUNCTION
@@ -321,7 +321,7 @@ END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
-SHOW FUNCTION STATUS;;
+SHOW FUNCTION STATUS WHERE Db <> 'mtr';;
Db bup_sfs
Name dollars
Type FUNCTION
@@ -409,7 +409,7 @@ END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
-SHOW FUNCTION STATUS;;
+SHOW FUNCTION STATUS WHERE Db <> 'mtr';;
Db bup_sfs
Name dollars
Type FUNCTION
@@ -521,7 +521,7 @@ teamno int(11) YES MUL NULL
playerno int(11) YES MUL NULL
won int(11) YES NULL
lost int(11) YES NULL
-SHOW FUNCTION STATUS;;
+SHOW FUNCTION STATUS WHERE Db <> 'mtr';;
Db bup_sfs
Name dollars
Type FUNCTION
=== modified file 'mysql-test/suite/backup/r/backup_procedures.result'
--- a/mysql-test/suite/backup/r/backup_procedures.result 2008-08-12 03:22:05 +0000
+++ b/mysql-test/suite/backup/r/backup_procedures.result 2008-09-02 14:04:39 +0000
@@ -65,7 +65,7 @@ Create Table CREATE TABLE `country` (
`ccode` char(10) DEFAULT NULL,
`city` varchar(10) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
-SHOW PROCEDURE STATUS;;
+SHOW PROCEDURE STATUS WHERE Db <> 'mtr';;
Db bup_sp
Name countryinfo
Type PROCEDURE
@@ -116,7 +116,7 @@ Create Table CREATE TABLE `country` (
`ccode` char(10) DEFAULT NULL,
`city` varchar(10) DEFAULT NULL
) ENGINE=ENGINE DEFAULT CHARSET=latin1
-SHOW PROCEDURE STATUS;;
+SHOW PROCEDURE STATUS WHERE Db <> 'mtr';;
Db bup_sp
Name countryinfo
Type PROCEDURE
=== modified file 'mysql-test/suite/backup/t/backup_functions.test'
--- a/mysql-test/suite/backup/t/backup_functions.test 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/backup/t/backup_functions.test 2008-09-02 14:04:39 +0000
@@ -145,7 +145,7 @@ SELECT square_area(11);
--query_vertical SHOW CREATE TABLE players;
describe penalties;
--replace_column 4 # 5 # 6 #
---query_vertical SHOW FUNCTION STATUS;
+--query_vertical SHOW FUNCTION STATUS WHERE Db <> 'mtr';
#Backup and restore data.
--echo backup data
@@ -172,7 +172,7 @@ describe penalties;
describe matches;
--replace_column 4 # 5 # 6 #
---query_vertical SHOW FUNCTION STATUS;
+--query_vertical SHOW FUNCTION STATUS WHERE Db <> 'mtr';
#Again calling function to check if Sf are backed up and restored properly or
# not.
@@ -204,7 +204,7 @@ SELECT @@SQL_MODE;
--query_vertical SHOW CREATE FUNCTION number_of_players;
--replace_column 4 # 5 # 6 #
---query_vertical SHOW FUNCTION STATUS;
+--query_vertical SHOW FUNCTION STATUS WHERE Db <> 'mtr';
#Again calling function to check if Sf are backed up and restored
#properly or not.
@@ -227,7 +227,7 @@ SELECT @@SQL_MODE;
--query_vertical SHOW CREATE DATABASE bup_sfs;
--query_vertical SHOW CREATE FUNCTION number_of_players;
--replace_column 4 # 5 # 6 #
---query_vertical SHOW FUNCTION STATUS;
+--query_vertical SHOW FUNCTION STATUS WHERE Db <> 'mtr';
#Again calling function to check if Sf are backed up and restored properly
#or not.
@@ -252,7 +252,7 @@ SELECT @@SQL_MODE;
--query_vertical SHOW CREATE TABLE players;
describe matches;
--replace_column 4 # 5 # 6 #
---query_vertical SHOW FUNCTION STATUS;
+--query_vertical SHOW FUNCTION STATUS WHERE Db <> 'mtr';
#Again calling function to check if Sf are backed up and restored properly
# ornot
=== modified file 'mysql-test/suite/backup/t/backup_procedures.test'
--- a/mysql-test/suite/backup/t/backup_procedures.test 2008-08-27 12:49:58 +0000
+++ b/mysql-test/suite/backup/t/backup_procedures.test 2008-09-02 14:04:39 +0000
@@ -77,7 +77,7 @@ SELECT @x;
--replace_result $ENGINE ENGINE
--query_vertical SHOW CREATE TABLE country;
--replace_column 4 # 5 # 6 # 7 #
---query_vertical SHOW PROCEDURE STATUS;
+--query_vertical SHOW PROCEDURE STATUS WHERE Db <> 'mtr';
#Backup and restore data.
@@ -99,7 +99,7 @@ RESTORE FROM 'bup_sp.bak';
--replace_result $ENGINE ENGINE
--query_vertical SHOW CREATE TABLE country;
--replace_column 4 # 5 # 6 # 7 #
---query_vertical SHOW PROCEDURE STATUS;
+--query_vertical SHOW PROCEDURE STATUS WHERE Db <> 'mtr';
#Excercise the objects after restore to make sure if objects are backedup and
| Thread |
|---|
| • bzr commit into mysql-6.0 branch (hezx:2684) | He Zhenxing | 2 Sep |
