bzr push into mysql-5.5-bugteam branch (Dmitry.Shulga:3238 to 3239) Bug#36742

[Dmitry Shulga]

 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
 3238 Dmitry Shulga	2010-10-12
      A follow up for the patch for Bug#45445, increase stack size
      to fix an sp-error.test failure on Sun Sparc system.

    modified:
      sql/sp_head.cc
=== 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
           {


Attachment: [text/bzr-bundle] bzr/[e-mail]