Bug #17361912 MYSQL_UPGRADE FAILS ON A SERVER WITH DISABLED INNODB

mayprasa · mayprasa · commit 8bee47fbd2f2 · 2013-09-17T12:31:53.000+05:30
Follow up patch for some cosmetics changes.
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
@@ -660,14 +660,16 @@ ALTER TABLE slave_master_info STATS_PERSISTENT=0;
 ALTER TABLE slave_worker_info STATS_PERSISTENT=0;
 ALTER TABLE slave_relay_log_info STATS_PERSISTENT=0;
 
-set @have_innodb= (select count(engine) from information_schema.engines where engine='InnoDB' and support != 'NO');
+SET @have_innodb= (SELECT COUNT(engine) FROM information_schema.engines WHERE engine='InnoDB' AND support != 'NO');
 SET @str=IF(@have_innodb <> 0, "ALTER TABLE innodb_table_stats STATS_PERSISTENT=0", "SET @dummy = 0");
 PREPARE stmt FROM @str;
 EXECUTE stmt;
+DROP PREPARE stmt;
 
 SET @str=IF(@have_innodb <> 0, "ALTER TABLE innodb_index_stats STATS_PERSISTENT=0", "SET @dummy = 0");
 PREPARE stmt FROM @str;
 EXECUTE stmt;
+DROP PREPARE stmt;
 
 --
 -- Check for accounts with old pre-4.1 passwords and issue a warning
