Cleanup tests for MDEV-13049 Querying INFORMATION_SCHEMA becomes slow…

… in MariaDB 10.1
MariaDB · Nov 2, 2017 · 9ada5a3 · 9ada5a3
1 parent 3a9b7f4
commit 9ada5a3
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 `日本語`;