From: Dmitry Shulga
Date: September 29 2010 1:11pm
Subject: bzr commit into mysql-5.1-bugteam branch (Dmitry.Shulga:3498) Bug#36742
List-Archive: http://lists.mysql.com/commits/119414
X-Bug: 36742
Message-Id: <0L9I00KLKFAOTN70@fe-emea-09.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_lxJ8uDnM9eMugdWAuM31HQ)"

--Boundary_(ID_lxJ8uDnM9eMugdWAuM31HQ)
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-29
      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-29 13:10:58 +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-29 13:10:58 +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-29 13:10:58 +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(system_charset_info, $$->host.str);
           }
         | CURRENT_USER optional_braces
           {


--Boundary_(ID_lxJ8uDnM9eMugdWAuM31HQ)
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: 4ed1b702b4c040ee6b6c281979ce47e1cde6f323
# timestamp: 2010-09-29 20:11:10 +0700
# base_revision_id: davi.arnaut@stripped\
#   h459kwlylg6h745v
# 
# Begin bundle
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


--Boundary_(ID_lxJ8uDnM9eMugdWAuM31HQ)--