bk commit into 4.1 tree (gluh:1.2544) BUG#21432

[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-08-23 15:54:40+05:00, gluh@stripped +7 -0
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
  

  include/mysql_com.h@stripped, 2006-08-23 15:54:36+05:00, gluh@stripped +3 -0
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    added new constants NAME_BYTE_LEN, USERNAME_BYTE_LENGTH

  mysql-test/r/ctype_utf8.result@stripped, 2006-08-23 15:54:36+05:00, gluh@stripped +12 -0
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    test case

  mysql-test/t/ctype_utf8.test@stripped, 2006-08-23 15:54:36+05:00, gluh@stripped +16 -0
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    test case

  sql-common/client.c@stripped, 2006-08-23 15:54:37+05:00, gluh@stripped +3 -3
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    increased buffers for user name & db

  sql/sql_acl.cc@stripped, 2006-08-23 15:54:36+05:00, gluh@stripped +5 -1
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    check that user name is not longer than USERNAME_LENGTH symbols

  sql/sql_parse.cc@stripped, 2006-08-23 15:54:37+05:00, gluh@stripped +2 -2
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    increased buffers for user name & db

  sql/table.cc@stripped, 2006-08-23 15:54:37+05:00, gluh@stripped +3 -1
    Bug#20393 User name truncation in mysql client
    Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
    check that db name is not longer than NAME_LEN symbols

# 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/Bugs/4.1.20393

--- 1.107/include/mysql_com.h	2006-08-23 15:54:46 +05:00
+++ 1.108/include/mysql_com.h	2006-08-23 15:54:46 +05:00
@@ -26,6 +26,9 @@
 #define USERNAME_LENGTH 16
 #define SERVER_VERSION_LENGTH 60
 #define SQLSTATE_LENGTH 5
+#define NAME_BYTE_LEN   NAME_LEN*3
+#define USERNAME_BYTE_LENGTH USERNAME_LENGTH*3
+
 
 #define LOCAL_HOST	"localhost"
 #define LOCAL_HOST_NAMEDPIPE "."

--- 1.176/sql/sql_acl.cc	2006-08-23 15:54:46 +05:00
+++ 1.177/sql/sql_acl.cc	2006-08-23 15:54:46 +05:00
@@ -2640,7 +2640,11 @@
   while ((Str = str_list++))
   {
     if (Str->host.length > HOSTNAME_LENGTH ||
-	Str->user.length > USERNAME_LENGTH)
+	system_charset_info->cset->charpos(system_charset_info,
+                                           Str->user.str,
+                                           Str->user.str +
+                                           Str->user.length,
+                                           USERNAME_LENGTH) < Str->user.length)
     {
       my_error(ER_GRANT_WRONG_HOST_OR_USER,MYF(0));
       result= -1;

--- 1.485/sql/sql_parse.cc	2006-08-23 15:54:46 +05:00
+++ 1.486/sql/sql_parse.cc	2006-08-23 15:54:46 +05:00
@@ -902,8 +902,8 @@
   char *user= end;
   char *passwd= strend(user)+1;
   char *db= passwd;
-  char db_buff[NAME_LEN+1];                     // buffer to store db in utf8
-  char user_buff[USERNAME_LENGTH+1];		// buffer to store user in utf8
+  char db_buff[NAME_BYTE_LEN + 1];              // buffer to store db in utf8
+  char user_buff[USERNAME_BYTE_LENGTH + 1];	// buffer to store user in utf8
   uint dummy_errors;
 
   /*

--- 1.136/sql/table.cc	2006-08-23 15:54:46 +05:00
+++ 1.137/sql/table.cc	2006-08-23 15:54:46 +05:00
@@ -1442,7 +1442,9 @@
       return 1;
     name++;
   }
-  return last_char_is_space || (uint) (name - start) > NAME_LEN;
+  return last_char_is_space || (system_charset_info->cset->
+                                  charpos(system_charset_info, start, name,
+                                          NAME_LEN) < (uint) (name - start));
 }
 
 

--- 1.71/mysql-test/r/ctype_utf8.result	2006-08-23 15:54:46 +05:00
+++ 1.72/mysql-test/r/ctype_utf8.result	2006-08-23 15:54:46 +05:00
@@ -1340,3 +1340,15 @@
 a
 e
 drop table t1;
+set names utf8;
+grant select on test.* to юзер_юзер@localhost;
+user()
+юзер_юзер@localhost
+revoke all on test.* from юзер_юзер@localhost;
+drop user юзер_юзер@localhost;
+create database
имя_базы_в_кодировке_утф8_длинной_более_чем_45;
+use имя_базы_в_кодировке_утф8_длинной_более_чем_45;
+select database();
+database()
+имя_базы_в_кодировке_утф8_длинной_более_чем_45
+drop database
имя_базы_в_кодировке_утф8_длинной_более_чем_45;

--- 1.73/mysql-test/t/ctype_utf8.test	2006-08-23 15:54:46 +05:00
+++ 1.74/mysql-test/t/ctype_utf8.test	2006-08-23 15:54:46 +05:00
@@ -1072,4 +1072,20 @@
 select a from t1 group by a;
 drop table t1;
 
+#
+# Bug#20393: User name truncation in mysql client
+# Bug#21432: Database/Table name limited to 64 bytes, not chars, problems with multi-byte
+#
+set names utf8;
+#create user юзер_юзер@localhost;
+grant select on test.* to юзер_юзер@localhost;
+--exec $MYSQL --default-character-set=utf8 --user=юзер_юзер -e "select user()"
+revoke all on test.* from юзер_юзер@localhost;
+drop user юзер_юзер@localhost;
+
+create database
имя_базы_в_кодировке_утф8_длинной_более_чем_45;
+use имя_базы_в_кодировке_утф8_длинной_более_чем_45;
+select database();
+drop database
имя_базы_в_кодировке_утф8_длинной_более_чем_45;
+
 # End of 4.1 tests

--- 1.91/sql-common/client.c	2006-08-23 15:54:46 +05:00
+++ 1.92/sql-common/client.c	2006-08-23 15:54:46 +05:00
@@ -1618,7 +1618,7 @@
 		       const char *passwd, const char *db,
 		       uint port, const char *unix_socket,ulong client_flag)
 {
-  char		buff[NAME_LEN+USERNAME_LENGTH+100];
+  char		buff[NAME_BYTE_LEN+USERNAME_BYTE_LENGTH+100];
   char		*end,*host_info;
   my_socket	sock;
   in_addr_t	ip_addr;
@@ -2063,7 +2063,7 @@
 		     mysql->server_status, client_flag));
   /* This needs to be changed as it's not useful with big packets */
   if (user && user[0])
-    strmake(end,user,USERNAME_LENGTH);          /* Max user name */
+    strmake(end,user,USERNAME_BYTE_LENGTH);          /* Max user name */
   else
     read_user_name((char*) end);
 
@@ -2093,7 +2093,7 @@
   /* Add database if needed */
   if (db && (mysql->server_capabilities & CLIENT_CONNECT_WITH_DB))
   {
-    end= strmake(end, db, NAME_LEN) + 1;
+    end= strmake(end, db, NAME_BYTE_LEN) + 1;
     mysql->db= my_strdup(db,MYF(MY_WME));
     db= 0;
   }