MDEV-14235 main.mysql_upgrade_noengine failed, results mismatch

06a9a366 · Alexander Barkov · 2ba1616e · 06a9a366
Commit 06a9a366 authored Nov 07, 2017 by Alexander Barkov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

client/mysql_upgrade.c client/mysql_upgrade.c +3 -2

No files found.
--- 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())
  {