Commit cc06415f authored by Elena Stepanova's avatar Elena Stepanova

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.
parent 2b5db1d5
...@@ -2,8 +2,8 @@ DROP DATABASE IF EXISTS d1; ...@@ -2,8 +2,8 @@ DROP DATABASE IF EXISTS d1;
CREATE DATABASE d1; CREATE DATABASE d1;
SHOW DATABASES; SHOW DATABASES;
Database Database
information_schema
d1 d1
information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
...@@ -13,8 +13,8 @@ Database (d%) ...@@ -13,8 +13,8 @@ Database (d%)
d1 d1
SHOW DATABASES LIKE '%'; SHOW DATABASES LIKE '%';
Database (%) Database (%)
information_schema
d1 d1
information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
...@@ -24,8 +24,8 @@ DROP DATABASE d1; ...@@ -24,8 +24,8 @@ DROP DATABASE d1;
CREATE SCHEMA d1; CREATE SCHEMA d1;
SHOW SCHEMAS; SHOW SCHEMAS;
Database Database
information_schema
d1 d1
information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
...@@ -35,8 +35,8 @@ Database (d%) ...@@ -35,8 +35,8 @@ Database (d%)
d1 d1
SHOW SCHEMAS LIKE '%'; SHOW SCHEMAS LIKE '%';
Database (%) Database (%)
information_schema
d1 d1
information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
......
...@@ -2,8 +2,8 @@ DROP DATABASE IF EXISTS d4; ...@@ -2,8 +2,8 @@ DROP DATABASE IF EXISTS d4;
CREATE DATABASE d4; CREATE DATABASE d4;
SHOW DATABASES; SHOW DATABASES;
Database Database
information_schema
d4 d4
information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
......
...@@ -5,8 +5,8 @@ Warnings: ...@@ -5,8 +5,8 @@ Warnings:
Note 1007 Can't create database 'd2'; database exists Note 1007 Can't create database 'd2'; database exists
SHOW DATABASES; SHOW DATABASES;
Database Database
information_schema
d2 d2
information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
...@@ -22,8 +22,8 @@ Warnings: ...@@ -22,8 +22,8 @@ Warnings:
Note 1007 Can't create database 'd2'; database exists Note 1007 Can't create database 'd2'; database exists
SHOW DATABASES; SHOW DATABASES;
Database Database
information_schema
d2 d2
information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
......
...@@ -2,8 +2,8 @@ DROP DATABASE IF EXISTS d5; ...@@ -2,8 +2,8 @@ DROP DATABASE IF EXISTS d5;
CREATE DATABASE d5; CREATE DATABASE d5;
SHOW DATABASES; SHOW DATABASES;
Database Database
information_schema
d5 d5
information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
......
...@@ -2,8 +2,8 @@ DROP DATABASE IF EXISTS d6; ...@@ -2,8 +2,8 @@ DROP DATABASE IF EXISTS d6;
CREATE DATABASE d6; CREATE DATABASE d6;
SHOW DATABASES; SHOW DATABASES;
Database Database
information_schema
d6 d6
information_schema
mtr mtr
mysql mysql
performance_schema performance_schema
......
...@@ -2,14 +2,18 @@ ...@@ -2,14 +2,18 @@
DROP DATABASE IF EXISTS d1; DROP DATABASE IF EXISTS d1;
--enable_warnings --enable_warnings
CREATE DATABASE d1; CREATE DATABASE d1;
--sorted_result
SHOW DATABASES; SHOW DATABASES;
SHOW DATABASES LIKE 'd%'; SHOW DATABASES LIKE 'd%';
--sorted_result
SHOW DATABASES LIKE '%'; SHOW DATABASES LIKE '%';
USE d1; USE d1;
DROP DATABASE d1; DROP DATABASE d1;
CREATE SCHEMA d1; CREATE SCHEMA d1;
--sorted_result
SHOW SCHEMAS; SHOW SCHEMAS;
SHOW SCHEMAS LIKE 'd%'; SHOW SCHEMAS LIKE 'd%';
--sorted_result
SHOW SCHEMAS LIKE '%'; SHOW SCHEMAS LIKE '%';
USE d1; USE d1;
DROP SCHEMA d1; DROP SCHEMA d1;
......
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
DROP DATABASE IF EXISTS d4; DROP DATABASE IF EXISTS d4;
--enable_warnings --enable_warnings
CREATE DATABASE d4; CREATE DATABASE d4;
--sorted_result
SHOW DATABASES; SHOW DATABASES;
--error 1007 --error 1007
CREATE DATABASE d4; CREATE DATABASE d4;
DROP DATABASE d4; DROP DATABASE d4;
--sorted_result
SHOW DATABASES; SHOW DATABASES;
...@@ -3,12 +3,14 @@ DROP DATABASE IF EXISTS d2; ...@@ -3,12 +3,14 @@ DROP DATABASE IF EXISTS d2;
--enable_warnings --enable_warnings
CREATE DATABASE d2; CREATE DATABASE d2;
CREATE DATABASE IF NOT EXISTS d2; CREATE DATABASE IF NOT EXISTS d2;
--sorted_result
SHOW DATABASES; SHOW DATABASES;
USE d2; USE d2;
DROP DATABASE d2; DROP DATABASE d2;
DROP DATABASE IF EXISTS d2; DROP DATABASE IF EXISTS d2;
CREATE SCHEMA d2; CREATE SCHEMA d2;
CREATE SCHEMA IF NOT EXISTS d2; CREATE SCHEMA IF NOT EXISTS d2;
--sorted_result
SHOW DATABASES; SHOW DATABASES;
USE d2; USE d2;
DROP SCHEMA d2; DROP SCHEMA d2;
......
...@@ -6,5 +6,6 @@ SHOW DATABASES; ...@@ -6,5 +6,6 @@ SHOW DATABASES;
--error 1008 --error 1008
DROP DATABASE nond5; DROP DATABASE nond5;
DROP DATABASE d5; DROP DATABASE d5;
--sorted_result
SHOW DATABASES; SHOW DATABASES;
...@@ -6,5 +6,6 @@ SHOW DATABASES; ...@@ -6,5 +6,6 @@ SHOW DATABASES;
--error 1064 --error 1064
USE DATABASE nond6; USE DATABASE nond6;
DROP DATABASE d6; DROP DATABASE d6;
--sorted_result
SHOW DATABASES; SHOW DATABASES;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment