Bug #18415196 MYSQL_UPGRADE DUPLICATE KEY ERROR FOR MYSQL.USER FOR 5.5.35+, 5.6.15+, 5.7.3+

vsmurthys · vsmurthys · commit 2cf0353874a3 · 2014-08-01T17:11:15.000+05:30
Merging from mysql-5.5 to mysql-5.6
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
@@ -634,9 +634,7 @@ DROP PROCEDURE IF EXISTS mysql.count_duplicate_host_names;
 DELIMITER //
 CREATE PROCEDURE mysql.count_duplicate_host_names()
 BEGIN
-  SET @duplicate_hosts=0;
   SET @duplicate_hosts=(SELECT count(*) FROM mysql.user GROUP BY user, lower(host) HAVING count(*) > 1 LIMIT 1);
-  select @duplicate_hosts;
   IF @duplicate_hosts > 1 THEN
     SIGNAL SQLSTATE '45000'  SET MESSAGE_TEXT = 'Multiple accounts exist for @user_name, @host_name that differ only in Host lettercase; remove all except one of them';
   END IF;
