summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-11-02 22:28:04 +0400
committerAlexander Barkov <bar@mariadb.org>2017-11-02 22:28:04 +0400
commit9ada5a3c1ac4a98ac7175e57e0b6badb83e4fcc0 (patch)
tree8bfe3ce43c0df926ef8dd3eaf42ed6f3345fa195
parent3a9b7f4ecddfa4d6866fed6279f86cbb57c663a0 (diff)
downloadmariadb-git-9ada5a3c1ac4a98ac7175e57e0b6badb83e4fcc0.tar.gz
Cleanup tests for MDEV-13049 Querying INFORMATION_SCHEMA becomes slow in MariaDB 10.1
Diffstat
-rw-r--r--mysql-test/suite/jp/r/jp_create_db_sjis.result2
-rw-r--r--mysql-test/suite/jp/r/jp_create_db_ucs2.result2
-rw-r--r--mysql-test/suite/jp/r/jp_create_db_ujis.result2
-rw-r--r--mysql-test/suite/jp/r/jp_create_db_utf8.result2
-rw-r--r--mysql-test/suite/jp/t/jp_create_db_sjis.test2
-rw-r--r--mysql-test/suite/jp/t/jp_create_db_ucs2.test2
-rw-r--r--mysql-test/suite/jp/t/jp_create_db_ujis.test2
-rw-r--r--mysql-test/suite/jp/t/jp_create_db_utf8.test2
8 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/suite/jp/r/jp_create_db_sjis.result b/mysql-test/suite/jp/r/jp_create_db_sjis.result
index 93524e1c443..78c80c27cc5 100644
--- a/mysql-test/suite/jp/r/jp_create_db_sjis.result
+++ b/mysql-test/suite/jp/r/jp_create_db_sjis.result
@@ -6,7 +6,7 @@ drop database if exists `ソ十表`;
CREATE DATABASE `ﾆﾎﾝｺﾞ`;
CREATE DATABASE `日本語`;
CREATE DATABASE `ソ十表`;
-SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name;
schema_name
information_schema
mysql
diff --git a/mysql-test/suite/jp/r/jp_create_db_ucs2.result b/mysql-test/suite/jp/r/jp_create_db_ucs2.result
index c6a2ff78b4f..380fcf09389 100644
--- a/mysql-test/suite/jp/r/jp_create_db_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_create_db_ucs2.result
@@ -7,7 +7,7 @@ SET character_set_server = ucs2;
CREATE DATABASE `屡斜爵室酌`;
CREATE DATABASE `ﾆﾋﾜｸ`;
CREATE DATABASE `常ﾜ常ﾝ常ﾞ`;
-SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name;
schema_name
information_schema
mysql
diff --git a/mysql-test/suite/jp/r/jp_create_db_ujis.result b/mysql-test/suite/jp/r/jp_create_db_ujis.result
index e5e0c2f1ad8..529a225e4ed 100644
--- a/mysql-test/suite/jp/r/jp_create_db_ujis.result
+++ b/mysql-test/suite/jp/r/jp_create_db_ujis.result
@@ -6,7 +6,7 @@ SET character_set_database = ujis;
CREATE DATABASE `屡斜爵室酌`;
CREATE DATABASE `ﾆﾋﾜｸ`;
CREATE DATABASE `常ﾜ常ﾝ常ﾞ`;
-SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name;
schema_name
information_schema
mysql
diff --git a/mysql-test/suite/jp/r/jp_create_db_utf8.result b/mysql-test/suite/jp/r/jp_create_db_utf8.result
index f07a36fd7c7..7d950ea53f9 100644
--- a/mysql-test/suite/jp/r/jp_create_db_utf8.result
+++ b/mysql-test/suite/jp/r/jp_create_db_utf8.result
@@ -6,7 +6,7 @@ SET character_set_database = utf8;
CREATE DATABASE `ｾｾ趣ｾ晢ｽｺｾ杼;
CREATE DATABASE `譌･譛ｬ隱杼;
CREATE DATABASE `鮴秘ｾ夜ｾ輿;
-SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name;
schema_name
information_schema
mysql
diff --git a/mysql-test/suite/jp/t/jp_create_db_sjis.test b/mysql-test/suite/jp/t/jp_create_db_sjis.test
index 49647bf1753..5458e6f0abd 100644
--- a/mysql-test/suite/jp/t/jp_create_db_sjis.test
+++ b/mysql-test/suite/jp/t/jp_create_db_sjis.test
@@ -16,7 +16,7 @@ CREATE DATABASE `ﾆﾎﾝｺﾞ`;
CREATE DATABASE `日本語`;
CREATE DATABASE `ソ十表`;
-SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name;
USE `ﾆﾎﾝｺﾞ`;
USE `日本語`;
diff --git a/mysql-test/suite/jp/t/jp_create_db_ucs2.test b/mysql-test/suite/jp/t/jp_create_db_ucs2.test
index 8be8cf62f15..a3f64d1ebc7 100644
--- a/mysql-test/suite/jp/t/jp_create_db_ucs2.test
+++ b/mysql-test/suite/jp/t/jp_create_db_ucs2.test
@@ -18,7 +18,7 @@ CREATE DATABASE `屡斜爵室酌`;
CREATE DATABASE `ﾆﾋﾜｸ`;
CREATE DATABASE `常ﾜ常ﾝ常ﾞ`;
-SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name;
USE `屡斜爵室酌`;
USE `ﾆﾋﾜｸ`;
diff --git a/mysql-test/suite/jp/t/jp_create_db_ujis.test b/mysql-test/suite/jp/t/jp_create_db_ujis.test
index 382c7937552..514745aad43 100644
--- a/mysql-test/suite/jp/t/jp_create_db_ujis.test
+++ b/mysql-test/suite/jp/t/jp_create_db_ujis.test
@@ -17,7 +17,7 @@ CREATE DATABASE `屡斜爵室酌`;
CREATE DATABASE `ﾆﾋﾜｸ`;
CREATE DATABASE `常ﾜ常ﾝ常ﾞ`;
-SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name;
USE `屡斜爵室酌`;
USE `ﾆﾋﾜｸ`;
diff --git a/mysql-test/suite/jp/t/jp_create_db_utf8.test b/mysql-test/suite/jp/t/jp_create_db_utf8.test
index 2df5b9e1f6f..8617af57c7b 100644
--- a/mysql-test/suite/jp/t/jp_create_db_utf8.test
+++ b/mysql-test/suite/jp/t/jp_create_db_utf8.test
@@ -16,7 +16,7 @@ CREATE DATABASE `ｾｾ趣ｾ晢ｽｺｾ杼;
CREATE DATABASE `譌･譛ｬ隱杼;
CREATE DATABASE `鮴秘ｾ夜ｾ輿;
-SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
+SELECT schema_name from information_schema.schemata where schema_name <> 'mtr' ORDER BY schema_name;
USE `ｾｾ趣ｾ晢ｽｺｾ杼;
USE `譌･譛ｬ隱杼;
View Lorry Controller Status