diff options
author | Elena Stepanova <elenst@montyprogram.com> | 2014-12-03 19:53:40 +0400 |
---|---|---|
committer | Elena Stepanova <elenst@montyprogram.com> | 2014-12-03 19:53:40 +0400 |
commit | cc06415fd64af404eda1518e0f5f9c1defd1707b (patch) | |
tree | 0e0c5a81f0875dc3b99ed38e68d6cb78f6c40b93 | |
parent | 2b5db1d5bcd7b46b654d59a07fc119ef6a6b8651 (diff) | |
download | mariadb-git-cc06415fd64af404eda1518e0f5f9c1defd1707b.tar.gz |
MDEV-7255 Failures in engines/* tests, part 1
In 10.0 output of SHOW DATABASES appears to be sorted, while in result
files it is not.
Added sorted_result for certainty and updated result files.
10 files changed, 19 insertions, 9 deletions
diff --git a/mysql-test/suite/engines/funcs/r/db_create_drop.result b/mysql-test/suite/engines/funcs/r/db_create_drop.result index 89c3b3ce991..85a871cf135 100644 --- a/mysql-test/suite/engines/funcs/r/db_create_drop.result +++ b/mysql-test/suite/engines/funcs/r/db_create_drop.result @@ -2,8 +2,8 @@ DROP DATABASE IF EXISTS d1; CREATE DATABASE d1; SHOW DATABASES; Database -information_schema d1 +information_schema mtr mysql performance_schema @@ -13,8 +13,8 @@ Database (d%) d1 SHOW DATABASES LIKE '%'; Database (%) -information_schema d1 +information_schema mtr mysql performance_schema @@ -24,8 +24,8 @@ DROP DATABASE d1; CREATE SCHEMA d1; SHOW SCHEMAS; Database -information_schema d1 +information_schema mtr mysql performance_schema @@ -35,8 +35,8 @@ Database (d%) d1 SHOW SCHEMAS LIKE '%'; Database (%) -information_schema d1 +information_schema mtr mysql performance_schema diff --git a/mysql-test/suite/engines/funcs/r/db_create_error.result b/mysql-test/suite/engines/funcs/r/db_create_error.result index 35d5d4abfeb..d18fe7ee5fd 100644 --- a/mysql-test/suite/engines/funcs/r/db_create_error.result +++ b/mysql-test/suite/engines/funcs/r/db_create_error.result @@ -2,8 +2,8 @@ DROP DATABASE IF EXISTS d4; CREATE DATABASE d4; SHOW DATABASES; Database -information_schema d4 +information_schema mtr mysql performance_schema diff --git a/mysql-test/suite/engines/funcs/r/db_create_if_not_exists.result b/mysql-test/suite/engines/funcs/r/db_create_if_not_exists.result index c9e31817910..2637087da5b 100644 --- a/mysql-test/suite/engines/funcs/r/db_create_if_not_exists.result +++ b/mysql-test/suite/engines/funcs/r/db_create_if_not_exists.result @@ -5,8 +5,8 @@ Warnings: Note 1007 Can't create database 'd2'; database exists SHOW DATABASES; Database -information_schema d2 +information_schema mtr mysql performance_schema @@ -22,8 +22,8 @@ Warnings: Note 1007 Can't create database 'd2'; database exists SHOW DATABASES; Database -information_schema d2 +information_schema mtr mysql performance_schema diff --git a/mysql-test/suite/engines/funcs/r/db_drop_error.result b/mysql-test/suite/engines/funcs/r/db_drop_error.result index 8db8cb598af..24a51768103 100644 --- a/mysql-test/suite/engines/funcs/r/db_drop_error.result +++ b/mysql-test/suite/engines/funcs/r/db_drop_error.result @@ -2,8 +2,8 @@ DROP DATABASE IF EXISTS d5; CREATE DATABASE d5; SHOW DATABASES; Database -information_schema d5 +information_schema mtr mysql performance_schema diff --git a/mysql-test/suite/engines/funcs/r/db_use_error.result b/mysql-test/suite/engines/funcs/r/db_use_error.result index 2051b56b19e..c2fce4f0acf 100644 --- a/mysql-test/suite/engines/funcs/r/db_use_error.result +++ b/mysql-test/suite/engines/funcs/r/db_use_error.result @@ -2,8 +2,8 @@ DROP DATABASE IF EXISTS d6; CREATE DATABASE d6; SHOW DATABASES; Database -information_schema d6 +information_schema mtr mysql performance_schema diff --git a/mysql-test/suite/engines/funcs/t/db_create_drop.test b/mysql-test/suite/engines/funcs/t/db_create_drop.test index 119db90293c..a807c146206 100644 --- a/mysql-test/suite/engines/funcs/t/db_create_drop.test +++ b/mysql-test/suite/engines/funcs/t/db_create_drop.test @@ -2,14 +2,18 @@ DROP DATABASE IF EXISTS d1; --enable_warnings CREATE DATABASE d1; +--sorted_result SHOW DATABASES; SHOW DATABASES LIKE 'd%'; +--sorted_result SHOW DATABASES LIKE '%'; USE d1; DROP DATABASE d1; CREATE SCHEMA d1; +--sorted_result SHOW SCHEMAS; SHOW SCHEMAS LIKE 'd%'; +--sorted_result SHOW SCHEMAS LIKE '%'; USE d1; DROP SCHEMA d1; diff --git a/mysql-test/suite/engines/funcs/t/db_create_error.test b/mysql-test/suite/engines/funcs/t/db_create_error.test index d88ef846b4b..ca83e5f0806 100644 --- a/mysql-test/suite/engines/funcs/t/db_create_error.test +++ b/mysql-test/suite/engines/funcs/t/db_create_error.test @@ -2,9 +2,11 @@ DROP DATABASE IF EXISTS d4; --enable_warnings CREATE DATABASE d4; +--sorted_result SHOW DATABASES; --error 1007 CREATE DATABASE d4; DROP DATABASE d4; +--sorted_result SHOW DATABASES; diff --git a/mysql-test/suite/engines/funcs/t/db_create_if_not_exists.test b/mysql-test/suite/engines/funcs/t/db_create_if_not_exists.test index 4e631d5657a..7b130504308 100644 --- a/mysql-test/suite/engines/funcs/t/db_create_if_not_exists.test +++ b/mysql-test/suite/engines/funcs/t/db_create_if_not_exists.test @@ -3,12 +3,14 @@ DROP DATABASE IF EXISTS d2; --enable_warnings CREATE DATABASE d2; CREATE DATABASE IF NOT EXISTS d2; +--sorted_result SHOW DATABASES; USE d2; DROP DATABASE d2; DROP DATABASE IF EXISTS d2; CREATE SCHEMA d2; CREATE SCHEMA IF NOT EXISTS d2; +--sorted_result SHOW DATABASES; USE d2; DROP SCHEMA d2; diff --git a/mysql-test/suite/engines/funcs/t/db_drop_error.test b/mysql-test/suite/engines/funcs/t/db_drop_error.test index f21b8b4e817..7fd6738cf1f 100644 --- a/mysql-test/suite/engines/funcs/t/db_drop_error.test +++ b/mysql-test/suite/engines/funcs/t/db_drop_error.test @@ -6,5 +6,6 @@ SHOW DATABASES; --error 1008 DROP DATABASE nond5; DROP DATABASE d5; +--sorted_result SHOW DATABASES; diff --git a/mysql-test/suite/engines/funcs/t/db_use_error.test b/mysql-test/suite/engines/funcs/t/db_use_error.test index 00a411ed5cb..9220660f84e 100644 --- a/mysql-test/suite/engines/funcs/t/db_use_error.test +++ b/mysql-test/suite/engines/funcs/t/db_use_error.test @@ -6,5 +6,6 @@ SHOW DATABASES; --error 1064 USE DATABASE nond6; DROP DATABASE d6; +--sorted_result SHOW DATABASES; |