summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-11-07 12:06:15 +0400
committerAlexander Barkov <bar@mariadb.org>2017-11-07 12:06:15 +0400
commit06a9a366a3df18b02a97fce8e585229f0c01bd09 (patch)
tree8cd466a341fa4b9fe76bd18e5cec0ca700470768
parent2ba1616e5d0f7008d5f6bf2c6cbc439935f6138b (diff)
downloadmariadb-git-06a9a366a3df18b02a97fce8e585229f0c01bd09.tar.gz
MDEV-14235 main.mysql_upgrade_noengine failed, results mismatch
-rw-r--r--client/mysql_upgrade.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index a6215d0a977..771fb947e73 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -965,8 +965,9 @@ static int install_used_engines(void)
{
char buf[512];
DYNAMIC_STRING ds_result;
- const char *query = "SELECT DISTINCT LOWER(engine) FROM information_schema.tables"
- " WHERE table_comment LIKE 'Unknown storage engine%'";
+ const char *query = "SELECT DISTINCT LOWER(engine) AS c1 FROM information_schema.tables"
+ " WHERE table_comment LIKE 'Unknown storage engine%'"
+ " ORDER BY c1";
if (opt_systables_only || !from_before_10_1())
{