From 7d904273f9535a933747ad2d975a359d401901a1 Mon Sep 17 00:00:00 2001
From: Venkata Sidagam <venkata.sidagam@oracle.com>
Date: Fri, 1 Aug 2014 17:09:55 +0530
Subject: [PATCH] Bug #18415196 MYSQL_UPGRADE DUPLICATE KEY ERROR FOR
 MYSQL.USER FOR 5.5.35+, 5.6.15+, 5.7.3+

Follow-up patch. Removed unwanted code.
---
 scripts/mysql_system_tables_fix.sql | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
index 0578e37fb7a..c101fd63308 100644
--- a/scripts/mysql_system_tables_fix.sql
+++ b/scripts/mysql_system_tables_fix.sql
@@ -658,9 +658,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;