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

--Boundary_(ID_C8ubWw5BtVrICj1TkULV6A)
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-27
      Fixed bug#36742 - GRANT hostname case handling inconsistent.
     @ sql/mysql_priv.h
        It was added declaration for host_to_lowercase.
     @ sql/sql_parse.cc
        It was added standalone procedure host_to_lowercase.
     @ sql/sql_yacc.yy
        It was added convertation of host name part of username to lowercase.

    modified:
      sql/mysql_priv.h
      sql/sql_parse.cc
      sql/sql_yacc.yy
=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2010-07-29 03:00:57 +0000
+++ b/sql/mysql_priv.h	2010-09-27 10:33:53 +0000
@@ -781,6 +781,7 @@ bool check_string_char_length(LEX_STRING
                               uint max_char_length, CHARSET_INFO *cs,
                               bool no_error);
 bool check_host_name(LEX_STRING *str);
+void host_to_lowercase(char *host);
 
 bool parse_sql(THD *thd,
                Parser_state *parser_state,

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2010-08-18 04:56:06 +0000
+++ b/sql/sql_parse.cc	2010-09-27 10:33:53 +0000
@@ -7807,6 +7807,12 @@ bool check_string_char_length(LEX_STRING
 }
 
 
+void host_to_lowercase(char *host)
+{
+  my_casedn_str(files_charset_info, host);
+}
+
+
 /*
   Check if path does not contain mysql data home directory
   SYNOPSIS

=== 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-27 10:33:53 +0000
@@ -11567,6 +11567,7 @@ user:
                                          system_charset_info, 0) ||
                 check_host_name(&$$->host))
               MYSQL_YYABORT;
+            host_to_lowercase($$->host.str);
           }
         | CURRENT_USER optional_braces
           {


--Boundary_(ID_C8ubWw5BtVrICj1TkULV6A)
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: deeb2585a43a699b80ba2233bf012eecf8ea39ff
# timestamp: 2010-09-27 17:34:11 +0700
# base_revision_id: davi.arnaut@stripped\
#   h459kwlylg6h745v
# 
# Begin bundle
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


--Boundary_(ID_C8ubWw5BtVrICj1TkULV6A)--