bzr push into mysql-5.1-bugteam branch (Sergey.Glukhov:2915 to 2916)

[Sergey Glukhov]

 2916 Sergey Glukhov	2009-05-28 [merge]
      5.0-bugteam->5.1-bugteam merge
     @ client/mysql.cc
        5.0-bugteam->5.1-bugteam merge
     @ mysql-test/r/mysql.result
        5.0-bugteam->5.1-bugteam merge
     @ mysql-test/t/mysql.test
        5.0-bugteam->5.1-bugteam merge

    modified:
      client/mysql.cc
      mysql-test/r/mysql.result
      mysql-test/t/mysql.test
 2915 Georgi Kodinov	2009-05-27 [merge]
      merged 5.1-bugteam to working tree

    modified:
      CMakeLists.txt
=== modified file 'client/mysql.cc'
--- a/client/mysql.cc	2009-05-15 13:25:29 +0000
+++ b/client/mysql.cc	2009-05-28 08:40:09 +0000
@@ -1979,7 +1979,7 @@ static COMMANDS *find_command(char *name
     */
     if (strstr(name, "\\g") || (strstr(name, delimiter) &&
                                 !(strlen(name) >= 9 &&
-                                  !my_strnncoll(charset_info,
+                                  !my_strnncoll(&my_charset_latin1,
                                                 (uchar*) name, 9,
                                                 (const uchar*) "delimiter",
                                                 9))))
@@ -2000,7 +2000,7 @@ static COMMANDS *find_command(char *name
   {
     if (commands[i].func &&
 	((name &&
-	  !my_strnncoll(charset_info,(uchar*)name,len,
+	  !my_strnncoll(&my_charset_latin1, (uchar*)name, len,
 				     (uchar*)commands[i].name,len) &&
 	  !commands[i].name[len] &&
 	  (!end || (end && commands[i].takes_params))) ||

=== modified file 'mysql-test/r/mysql.result'
--- a/mysql-test/r/mysql.result	2009-05-15 13:25:29 +0000
+++ b/mysql-test/r/mysql.result	2009-05-28 08:40:09 +0000
@@ -198,6 +198,7 @@ COUNT (*)
 1
 COUNT (*)
 1
+ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (1)
 End of 5.0 tests
 WARNING: --server-arg option not supported in this configuration.
 Warning (Code 1286): Unknown table engine 'nonexistent'

=== modified file 'mysql-test/t/mysql.test'
--- a/mysql-test/t/mysql.test	2009-05-15 17:36:59 +0000
+++ b/mysql-test/t/mysql.test	2009-05-28 08:40:09 +0000
@@ -349,6 +349,13 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug310
 --exec $MYSQL --ignore-spaces -e "SELECT COUNT (*)"
 --exec $MYSQL -b -i -e "SELECT COUNT (*)"
 
+#
+# Bug#37268 'binary' character set makes CLI-internal commands case sensitive
+#
+--error 1
+--exec $MYSQL --default-character-set=binary test -e "CONNECT test invalid_hostname" 2>&1
+--exec $MYSQL --default-character-set=binary test -e "DELIMITER //" 2>&1
+
 --echo End of 5.0 tests
 
 #


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