bk commit into 4.1 tree (gluh:1.2528)

[gluh]

Below is the list of changes that have just been committed into a local
4.1 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-20 13:25:55+05:00, gluh@stripped +1 -0
  Merge mysql.com:/home/gluh/MySQL/Merge/4.1
  into  mysql.com:/home/gluh/MySQL/Merge/4.1-kt
  MERGE: 1.2522.1.47

  sql/sql_parse.cc@stripped, 2006-09-20 13:25:51+05:00, gluh@stripped +0 -0
    Auto merged
    MERGE: 1.486.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	gluh.(none)
# Root:	/home/gluh/MySQL/Merge/4.1-kt/RESYNC

--- 1.487/sql/sql_parse.cc	2006-09-20 13:26:02 +05:00
+++ 1.488/sql/sql_parse.cc	2006-09-20 13:26:02 +05:00
@@ -146,7 +146,7 @@
 {
   int return_val= 0;
   uint temp_len, user_len;
-  char temp_user[USERNAME_LENGTH+HOSTNAME_LENGTH+2];
+  char temp_user[USERNAME_BYTE_LENGTH+HOSTNAME_LENGTH+2];
   struct  user_conn *uc;
 
   DBUG_ASSERT(user != 0);
@@ -640,7 +640,7 @@
   {
     USER_CONN *uc;
     uint temp_len=lu->user.length+lu->host.length+2;
-    char temp_user[USERNAME_LENGTH+HOSTNAME_LENGTH+2];
+    char temp_user[USERNAME_BYTE_LENGTH+HOSTNAME_LENGTH+2];
 
     memcpy(temp_user,lu->user.str,lu->user.length);
     memcpy(temp_user+lu->user.length+1,lu->host.str,lu->host.length);
@@ -1395,7 +1395,11 @@
   {
     char *db, *tbl_name;
     uint db_len= *(uchar*) packet;
-    if (db_len >= packet_length || db_len > NAME_LEN)
+    if (db_len >= packet_length || 
+        system_charset_info->cset->charpos(system_charset_info,
+                                           packet + 1,
+                                           packet + 1 + db_len,
+                                           USERNAME_LENGTH) < db_len)
     {
       send_error(thd, ER_UNKNOWN_COM_ERROR);
       break;
@@ -1429,7 +1433,7 @@
       password.  New clients send the size (1 byte) + string (not null
       terminated, so also '\0' for empty string).
     */
-    char db_buff[NAME_LEN+1];                 // buffer to store db in utf8 
+    char db_buff[NAME_BYTE_LEN+1];                 // buffer to store db in utf8 
     char *db= passwd;
     uint passwd_len= thd->client_capabilities & CLIENT_SECURE_CONNECTION ? 
       *passwd++ : strlen(passwd);