find_files(): don't sort files in my_dir(), sort table names

after all engines have discovered their tables
  
side effect: correct alphabetical sorting as in ORDER BY ... COLLATE utf8_bin,
information_schema is no longer the first after find_files(),
tables like #mysql50#zzz are sorted first (as per table name),
not last (as per file name zzz).

10 files changed, 21 insertions, 21 deletions

diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result
index db3aa770499..55309e54fb3 100644
--- a/mysql-test/r/drop.result
+++ b/mysql-test/r/drop.result
@@ -142,9 +142,9 @@ create table `#mysql50#aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 ERROR 42000: Incorrect table name '#mysql50#aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa12345'
 show tables;
 Tables_in_mysqltestbug26703
+#mysql50#abc`def
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1234
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-#mysql50#abc`def
 use test;
 drop database mysqltestbug26703;
 End of 5.1 tests
diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result
index 034913a72e6..14ade969b25 100644
--- a/mysql-test/r/mysqlcheck.result
+++ b/mysql-test/r/mysqlcheck.result
@@ -176,15 +176,15 @@ t1
 v1
 show tables;
 Tables_in_test
-t1
 #mysql50#v-1
+t1
 v1
 test.t1                                            OK
 show tables;
 Tables_in_test
 t1
-v1
 v-1
+v1
 drop view v1, `v-1`;
 drop table t1;
 SET NAMES utf8;
diff --git a/mysql-test/r/mysqlslap.result b/mysql-test/r/mysqlslap.result
index 069c9182de2..38a7b0a694e 100644
--- a/mysql-test/r/mysqlslap.result
+++ b/mysql-test/r/mysqlslap.result
@@ -234,8 +234,8 @@ test
 # 'bug58090' database should be present.
 SHOW DATABASES;
 Database
-information_schema
 bug58090
+information_schema
 mtr
 mysql
 performance_schema
diff --git a/mysql-test/r/schema.result b/mysql-test/r/schema.result
index 809d652053e..bb6dbd65f84 100644
--- a/mysql-test/r/schema.result
+++ b/mysql-test/r/schema.result
@@ -5,8 +5,8 @@ Database	Create Database
 foo	CREATE DATABASE `foo` /*!40100 DEFAULT CHARACTER SET latin1 */
 show schemas;
 Database
-information_schema
 foo
+information_schema
 mtr
 mysql
 performance_schema
diff --git a/mysql-test/r/upgrade.result b/mysql-test/r/upgrade.result
index ec63cc0d98c..4f52fd1e246 100644
--- a/mysql-test/r/upgrade.result
+++ b/mysql-test/r/upgrade.result
@@ -33,12 +33,12 @@ show create database `#mysql50#mysqltest-1`;
 ERROR 42000: Unknown database '#mysql50#mysqltest-1'
 show tables in `mysqltest1`;
 Tables_in_mysqltest1
-t1
 t-1
+t1
 show tables in `mysqltest-1`;
 Tables_in_mysqltest-1
-t1
 t-1
+t1
 drop database `mysqltest1`;
 drop database `mysqltest-1`;
 drop table if exists `txu@0023p@0023p1`;
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 b7c09fbfbe9..93524e1c443 100644
--- a/mysql-test/suite/jp/r/jp_create_db_sjis.result
+++ b/mysql-test/suite/jp/r/jp_create_db_sjis.result
@@ -9,12 +9,12 @@ CREATE DATABASE `ソ十表`;
 SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
 schema_name
 information_schema
-ソ十表
-日本語
-ﾆﾎﾝｺﾞ
 mysql
 performance_schema
 test
+ソ十表
+日本語
+ﾆﾎﾝｺﾞ
 USE `ﾆﾎﾝｺﾞ`;
 USE `日本語`;
 USE `ソ十表`;
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 3832ff5a0c7..c6a2ff78b4f 100644
--- a/mysql-test/suite/jp/r/jp_create_db_ucs2.result
+++ b/mysql-test/suite/jp/r/jp_create_db_ucs2.result
@@ -10,12 +10,12 @@ CREATE DATABASE `常ﾜ常ﾝ常ﾞ`;
 SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
 schema_name
 information_schema
-ﾆ�ﾋﾜｸ�
-常ﾜ常ﾝ常ﾞ
-屡斜爵室酌
 mysql
 performance_schema
 test
+ﾆ�ﾋﾜｸ�
+常ﾜ常ﾝ常ﾞ
+屡斜爵室酌
 USE `屡斜爵室酌`;
 USE `ﾆ�ﾋﾜｸ�`;
 USE `常ﾜ常ﾝ常ﾞ`;
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 d6bf31336fd..e5e0c2f1ad8 100644
--- a/mysql-test/suite/jp/r/jp_create_db_ujis.result
+++ b/mysql-test/suite/jp/r/jp_create_db_ujis.result
@@ -9,12 +9,12 @@ CREATE DATABASE `常ﾜ常ﾝ常ﾞ`;
 SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
 schema_name
 information_schema
-ﾆ�ﾋﾜｸ�
-常ﾜ常ﾝ常ﾞ
-屡斜爵室酌
 mysql
 performance_schema
 test
+ﾆ�ﾋﾜｸ�
+常ﾜ常ﾝ常ﾞ
+屡斜爵室酌
 USE `屡斜爵室酌`;
 USE `ﾆ�ﾋﾜｸ�`;
 USE `常ﾜ常ﾝ常ﾞ`;
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 62202d43df0..f07a36fd7c7 100644
--- a/mysql-test/suite/jp/r/jp_create_db_utf8.result
+++ b/mysql-test/suite/jp/r/jp_create_db_utf8.result
@@ -9,12 +9,12 @@ CREATE DATABASE `鮴秘ｾ夜ｾ輿;
 SELECT schema_name from information_schema.schemata where schema_name <> 'mtr';
 schema_name
 information_schema
-譌･譛ｬ隱�
-鮴秘ｾ夜ｾ�
-�ｾ��ｾ趣ｾ晢ｽｺ�ｾ�
 mysql
 performance_schema
 test
+譌･譛ｬ隱�
+鮴秘ｾ夜ｾ�
+�ｾ��ｾ趣ｾ晢ｽｺ�ｾ�
 USE `�ｾ��ｾ趣ｾ晢ｽｺ�ｾ杼;
 USE `譌･譛ｬ隱杼;
 USE `鮴秘ｾ夜ｾ輿;
diff --git a/mysql-test/suite/sys_vars/r/ignore_db_dirs_basic.result b/mysql-test/suite/sys_vars/r/ignore_db_dirs_basic.result
index 55d61800a39..5802c71d280 100644
--- a/mysql-test/suite/sys_vars/r/ignore_db_dirs_basic.result
+++ b/mysql-test/suite/sys_vars/r/ignore_db_dirs_basic.result
@@ -6,8 +6,8 @@ e,lost+found,.mysqlgui,ignored_db
 # with '.'
 SHOW DATABASES;
 Database
-information_schema
 #mysql50#.otherdir
+information_schema
 mtr
 mysql
 performance_schema
@@ -33,8 +33,8 @@ id
 2
 SHOW DATABASES;
 Database
-information_schema
 #mysql50#.otherdir
+information_schema
 lost+found
 mtr
 mysql