diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-04-07 17:17:25 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-04-07 17:17:25 +0200 |
commit | 2a9662b401405ee8f8f0849f7f90faac1081e26e (patch) | |
tree | 55dc85cf9bfc5cf7501efe7e24342e22db8bf7fd /mysql-test/r/upgrade.result | |
parent | 8980e67693c8f011200bc3924f5a8fc914aecc51 (diff) | |
download | mariadb-git-2a9662b401405ee8f8f0849f7f90faac1081e26e.tar.gz |
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).
Diffstat (limited to 'mysql-test/r/upgrade.result')
-rw-r--r-- | mysql-test/r/upgrade.result | 4 |
1 files changed, 2 insertions, 2 deletions
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`; |