diff options
| author | Venkata Sidagam <venkata.sidagam@oracle.com> | 2014-08-01 17:09:55 +0530 |
|---|---|---|
| committer | Venkata Sidagam <venkata.sidagam@oracle.com> | 2014-08-01 17:09:55 +0530 |
| commit | 7d904273f9535a933747ad2d975a359d401901a1 (patch) | |
| tree | b2138ebceff1bf06f2bc2ca47f762f85ed006bae /scripts | |
| parent | 7879b3eefd888a4f8b6cf87b22a815cc2c4a139e (diff) | |
| download | mariadb-git-7d904273f9535a933747ad2d975a359d401901a1.tar.gz | |
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.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_system_tables_fix.sql | 2 |
1 files changed, 0 insertions, 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; |