From: Dmitry Shulga
Date: October 13 2010 5:29am
Subject: bzr commit into mysql-5.1-bugteam branch (Dmitry.Shulga:3527) Bug#36742
List-Archive: http://lists.mysql.com/commits/120614
X-Bug: 36742
Message-Id: <0LA7005J1R8L6S10@fe-emea-09.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_UkPLuqTN3gkxHHboixpjWQ)"

--Boundary_(ID_UkPLuqTN3gkxHHboixpjWQ)
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:li-bing.song@stripped

 3527 Dmitry Shulga	2010-10-13
      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-10-13 05:28: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-10-13 05:28: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-10-13 05:28:58 +0000
@@ -11567,6 +11567,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_UkPLuqTN3gkxHHboixpjWQ)
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: 19dc59467e7f9a4b51bcd1bcaea643afcae4b1c8
# timestamp: 2010-10-13 12:29:07 +0700
# base_revision_id: li-bing.song@stripped\
#   vivytt3oiwkco480
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWR2Lf+gAA2nfgEBwXPf//3+v
ngC////wYAeLh8+znQOtzzAU8vZXpzUW6DJGlMU09TR6T1MNNTaTah6jEGhoGRtCbU00ElCDRNkJ
mk0k8KeU2kAyaAAANDQcZMmTEYmAEyYJkANGEYAhgEiJMhGo00ajZRtJoGgGgGmgDRoAIqEmqbwg
aRg0mUyemk9PUjEeoDQAGgEkiZA1Mhop5ppogE9U/CkPIxIBkAepmcfwSi1yxzKldBTo/R/Xpq8l
+WRtVi/ciYxoHI2CVYw4k4jiLQeMjxrpZS6vRP+76msLEgmFJfQ4SLIbl8lBNsY11dIcVLTvOTTS
KNYHfuoUrMfPrGIuXZu8gQtMfXhGbxJDRH3tJccZHTU+jV9MJxnWdQMYymOtbshUZSik/BjISXF1
HQVDIPhUw3DPKvDg7fIaeWpGum23KuzzY+kVGJdzuttrYn5tBvjJKhoicG48RdKJyetUWFygLcAd
6/mIi33KHDuVGAqV2P39Z2TWPnVh7xastOgUtr+BCUmKmQrOAyJhG1OFANibbbWjircVBsaY82e6
lXnlGLYMnKRQONkqygVpS9NRXCoInLVYuLWJsooULxdRcsyl9q0cNlgYwOHFuKs7gZ5M0rtvwYiR
GiBF6azc+04Dj2HGt6YKad1dI3DHQ3KYRIUDehhhCk7IOV6rOOeZqFrHRzfeMNjR6cXqKmaWW6ua
hBj3jEw0WuZk0iJ7AE4uecowmn24R158zshPoul/qyiMzESrCYfqgnC2G0c0tPFwUZjUrejuPbu3
vgI1iuaK+sZLpR38ZQfQ+blK6dq2lx/FNKUeSsykWirYb50NroHOU+qlbHxH6jNlZJSqVhzpwR0l
TokscRGS5EXi4OaK3MqcIxooWnc0/uB0MUhlTRGY41KzJ3brMyOgzLLSnuiMJK9XNjdeMjeQbVaR
vtuxad2o27RQtLC8uyrRUaYDpx8TnNs60YwVAtJhCeiYhPzMG2wFUUuTXWUc7I7HiaapyFMxkMLV
olfrvJO0WEGLS4nS9Ak1MKbHQEczX1rTTcbCiM00tDGDVMWiHDIGoJuFpXCai5ikInecBEtYxSoJ
xFhZyBZlxjEgymI1qM9jO3oJN4vnArnhVZdEYW0Oiz1rFqXphIZX1oiqjBwF10RYUl+D1nr2nuEz
j5gjLfG33V15GJKAMPgdlCi2gCPjtLARVAIShQJTYEy4tFZjiUK1fYTS6nYzgrVNA783CYrpYUQF
Je5gKpQRzXg4AdQenFKgHMnOTCPbkWolDdXVmTeS+Cd3YxFOLytSon0gaYuNLhL0Xa+1AzFwjL6p
pJXkE1fw++o6Hpl2n3YulnXFeKvzJ4xwQbJ0Um+wyHxPEtMUrZJj2y3IrHDneu7fRPusXqb1VPlX
UvsAL5SqFQUpyXkr78DJrGVSL6VSd9KKsCVFKTG8wPRygrD0LFUVlRGYrO4KJfI94MtOaCqqXV2r
OnqPWGrw3ak88BjPxIm4YjAZb+S2GyjI02uwfeNgRHBneUYqxSnZZnWCpFdOOmON+E9ZgB9roieQ
PC1xSKLM647hkhGBTZxPQI0P6mwikWXm1zJ50TkaoogwENr3iMigHJ5Qb8TXIKRDNIU5oHAPSm7F
cg6zgZjYdRo6jmQK3D1RzhiCzxsTg7t7BuYmM5n2kyXoDyMdDaTkGDDyRdNsFMwWwKGA5zQ6TVl3
ZAui3Rixsx53qxm/YiZwGpw587+0Oagnqxe61ileDgcZv+KBEUpRTCVZpWZrb1CLBsR/IGDUKI0n
WwUHvheuzhKmuwaqxjrRxknpfC83+k7czHuNptm0uFgTvK1mHrzj3YcCFQxHDq0Mz+p0u0XI3hgQ
OgHjWZojbNxpvqDYFwjqVAoF3E1saubMSIdZfvTgPQYBiSHwMomrBXvpoCqX0kZswbjw7gkOKoCG
cAjj3MRb3DZ7sBY0YJNWhNg1n1HXvpUKDEMCrRBkaXfyRa1mJQGTrZZr1v9IBXidDkJDQgTDfG4h
0cW1n74YDqGki4Bg6IuMWznqclYPATLZsZMhhlAPOmnBlauduNGRVlc3JYq+4LqADdXzWhaC4ZVM
5gKTn4vQoQF0qEqlBLzIoM/FF3R4MqZ7zMtNPbu8QrW5VKysx7RDxhSIvkaQ48DDuxU5HbjiYBZG
kJmWcuB6F7AwtLPl6vOuAaVs3FrEaRa7l5+Ba2VXOtrzREREdCyaUTKpQ1BsGNNjTYwYRlJ3rxZY
2FzJKi3F7OwbGbfCa5MHBIag/yrdDITWVEoaNMGpeWAzXLNPQJknj9lcFkqxLg1kRzxO25FIRv+T
75spqJrVC0rSZZ3DQyJaQaYpayv8odveb06wfLUPugIWYn1X+0dmDhDcxmT1gukyUkU+nI3C2LrT
T1/ERxEUKtDCw1sQk5mlrhczcrhb6zuvUVkcoRRg4BJdm5JuxqZkM/iYqaQ4MNfATrd7Q5Ax2ZP+
LuSKcKEgOxb/0A==


--Boundary_(ID_UkPLuqTN3gkxHHboixpjWQ)--