From 06a9a366a3df18b02a97fce8e585229f0c01bd09 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Tue, 7 Nov 2017 12:06:15 +0400 Subject: [PATCH] MDEV-14235 main.mysql_upgrade_noengine failed, results mismatch --- client/mysql_upgrade.c | 5 +++-- 1 file 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()) {