From: Dmitry Shulga
Date: October 13 2010 6:28am
Subject: bzr commit into mysql-5.5-bugteam branch (Dmitry.Shulga:3239) Bug#36742
List-Archive: http://lists.mysql.com/commits/120617
X-Bug: 36742
Message-Id: <0LA700CN2TZ5GN70@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_DMDZ7lfJYw0f32+bCxxFxQ)"

--Boundary_(ID_DMDZ7lfJYw0f32+bCxxFxQ)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///Users/shulga/projects/mysql/mysql-5.5-bugteam/ based on revid:dmitry.shulga@stripped

 3239 Dmitry Shulga	2010-10-13 [merge]
      Auto-merge from mysql-5.1-bugteam for bug#36742.

    modified:
      mysql-test/r/grant.result
      mysql-test/t/grant.test
      sql/sql_yacc.yy
=== modified file 'mysql-test/r/grant.result'
--- a/mysql-test/r/grant.result	2010-08-16 15:16:07 +0000
+++ b/mysql-test/r/grant.result	2010-10-13 06:27:03 +0000
@@ -1577,6 +1577,17 @@ DROP USER 'testbug'@localhost;
 DROP TABLE db2.t1;
 DROP DATABASE db1;
 DROP DATABASE db2;
+#
+# Bug #36742
+#
+grant usage on Foo.* to myuser@Localhost identified by 'foo';
+grant select on Foo.* to myuser@localhost;
+select host,user from mysql.user where User='myuser';
+host	user
+localhost	myuser
+revoke select on Foo.* from myuser@localhost;
+delete from mysql.user where User='myuser';
+flush privileges;
 #########################################################################
 #
 # Bug#38347: ALTER ROUTINE privilege allows SHOW CREATE TABLE.

=== modified file 'mysql-test/t/grant.test'
--- a/mysql-test/t/grant.test	2010-08-16 15:16:07 +0000
+++ b/mysql-test/t/grant.test	2010-10-13 06:27:03 +0000
@@ -1578,6 +1578,16 @@ DROP TABLE db2.t1;
 DROP DATABASE db1;
 DROP DATABASE db2;
 
+--echo #
+--echo # Bug #36742
+--echo #
+grant usage on Foo.* to myuser@Localhost identified by 'foo';
+grant select on Foo.* to myuser@localhost;
+select host,user from mysql.user where User='myuser';
+revoke select on Foo.* from myuser@localhost;
+delete from mysql.user where User='myuser';
+flush privileges;
+
 # Wait till we reached the initial number of concurrent sessions
 --source include/wait_until_count_sessions.inc
 

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2010-10-07 23:34:59 +0000
+++ b/sql/sql_yacc.yy	2010-10-13 06:27:03 +0000
@@ -12334,6 +12334,12 @@ user:
                                          system_charset_info, 0) ||
                 check_host_name(&$$->host))
               MYSQL_YYABORT;
+            /*
+              Convert hostname part of username to lowercase.
+              It's OK to use in-place lowercase as long as
+              the character set is utf8.
+            */
+            my_casedn_str(system_charset_info, $$->host.str);
           }
         | CURRENT_USER optional_braces
           {


--Boundary_(ID_DMDZ7lfJYw0f32+bCxxFxQ)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/dmitry.shulga@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/dmitry.shulga@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@stripped
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.5-\
#   bugteam/
# testament_sha1: 93d8e1a497ad5b576ed1376988e28ec3f871b6fa
# timestamp: 2010-10-13 13:28:15 +0700
# source_branch: file:///Users/shulga/projects/mysql/5.1-bugteam-\
#   bug36742/
# base_revision_id: dmitry.shulga@stripped\
#   4g7xt4a7za2cnonp
# 
# Begin bundle
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
5IpwoSApaShm


--Boundary_(ID_DMDZ7lfJYw0f32+bCxxFxQ)--