Commit ddb9f866 authored by unknown's avatar unknown
Browse files

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:
  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, SYSTEM_CHARSET_MBMAXLEN
mysql-test/r/ctype_utf8.result:
  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:
  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:
  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:
  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:
  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:
  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
parent 2416a453

include/mysql_com.h

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ 
#define USERNAME_LENGTH 16

#define SERVER_VERSION_LENGTH 60

#define SQLSTATE_LENGTH 5

#define SYSTEM_CHARSET_MBMAXLEN 3

#define NAME_BYTE_LEN   NAME_LEN*SYSTEM_CHARSET_MBMAXLEN

#define USERNAME_BYTE_LENGTH USERNAME_LENGTH*SYSTEM_CHARSET_MBMAXLEN



#define LOCAL_HOST	"localhost"

#define LOCAL_HOST_NAMEDPIPE "."

mysql-test/r/ctype_utf8.result

+12 −0
Original line number Diff line number Diff line
@@ -1340,3 +1340,15 @@ select a from t1 group by a; 
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;

mysql-test/t/ctype_utf8.test

+16 −0
Original line number Diff line number Diff line
@@ -1072,4 +1072,20 @@ explain select a from t1 group by a; 
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

sql-common/client.c

+3 −3
Original line number Diff line number Diff line
@@ -1618,7 +1618,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, 
		       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 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, 
		     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 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, 
  /* 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;

  }

sql/sql_acl.cc

+5 −1
Original line number Diff line number Diff line
@@ -2640,7 +2640,11 @@ int mysql_grant(THD *thd, const char *db, List <LEX_USER> &list, 
  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;