From: Dmitry Shulga
Date: September 28 2010 10:13am
Subject: bzr commit into mysql-5.1-bugteam branch (Dmitry.Shulga:3498) Bug#36742
List-Archive: http://lists.mysql.com/commits/119247
X-Bug: 36742
Message-Id: <0L9G006SJCED6X10@fe-emea-10.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_BlPw6fh6MKt6sdJrnGpW+Q)"

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

#At file:///Users/shulga/projects/mysql/5.1-bugteam-bug36742/ based on revid:davi.arnaut@stripped

 3498 Dmitry Shulga	2010-09-28
      Fixed bug#36742 - GRANT hostname case handling inconsistent.
     @ mysql-test/r/grant.result
        It was added result for test case for bug#36742.
     @ mysql-test/t/grant.test
        It was added test case for bug#36742.
     @ sql/sql_yacc.yy
        It was added convertation of host name part of user name to lowercase.

    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-07-08 18:46:26 +0000
+++ b/mysql-test/r/grant.result	2010-09-28 10:13:11 +0000
@@ -1429,3 +1429,14 @@ 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;

=== modified file 'mysql-test/t/grant.test'
--- a/mysql-test/t/grant.test	2010-07-08 18:46:26 +0000
+++ b/mysql-test/t/grant.test	2010-09-28 10:13:11 +0000
@@ -1550,5 +1550,15 @@ 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-08-30 22:16:38 +0000
+++ b/sql/sql_yacc.yy	2010-09-28 10:13:11 +0000
@@ -11567,6 +11567,8 @@ user:
                                          system_charset_info, 0) ||
                 check_host_name(&$$->host))
               MYSQL_YYABORT;
+            /* Convert hostname part of username to lowercase. */
+            my_casedn_str(files_charset_info, $$->host.str);
           }
         | CURRENT_USER optional_braces
           {


--Boundary_(ID_BlPw6fh6MKt6sdJrnGpW+Q)
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/5.1-bugteam-\
#   bug36742/
# testament_sha1: caec72f6f0264161f9ca36ceff890dfd0e7db429
# timestamp: 2010-09-28 17:13:23 +0700
# base_revision_id: davi.arnaut@stripped\
#   h459kwlylg6h745v
# 
# Begin bundle
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
tAJpDcxn0OtpbgsErtu/4u5IpwoSHT1TEeA=


--Boundary_(ID_BlPw6fh6MKt6sdJrnGpW+Q)--