Commit 146049d2 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/gluh/MySQL/Merge/4.1-merge 

into  mysql.com:/home/gluh/MySQL/Merge/5.0


include/mysql_com.h:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  manual merge
sql/sql_acl.cc:
  manual merge
parents 979d9c8f ddb9f866

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



/*

  USER_HOST_BUFF_SIZE -- length of string buffer, that is enough to contain

mysql-test/r/ctype_utf8.result

+12 −0
Original line number Diff line number Diff line
@@ -1340,6 +1340,18 @@ select a from t1 group by a; 
a

e

drop table t1;

set names utf8;

grant select on test.* to <8e>зе<80>_<8e>зе<80>@localhost;

user()

<8e>зе<80>_<8e>зе<80>@localhost

revoke all on test.* from <8e>зе<80>_<8e>зе<80>@localhost;

drop user <8e>зе<80>_<8e>зе<80>@localhost;

create database им<8f>_баз<8b>_в_коди<80>овке_<83><82><84>8_длиной_бол<8c><88>е_<87>ем_45;

use им<8f>_баз<8b>_в_коди<80>овке_<83><82><84>8_длиной_бол<8c><88>е_<87>ем_45;

select database();

database()

им<8f>_баз<8b>_в_коди<80>овке_<83><82><84>8_длиной_бол<8c><88>е_<87>ем_45

drop database им<8f>_баз<8b>_в_коди<80>овке_<83><82><84>8_длиной_бол<8c><88>е_<87>ем_45;

CREATE TABLE t1(id varchar(20) NOT NULL) DEFAULT CHARSET=utf8;

INSERT INTO t1 VALUES ('xxx'), ('aa'), ('yyy'), ('aa');

SELECT id FROM t1;

mysql-test/t/ctype_utf8.test

+16 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,22 @@ 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
@@ -1758,7 +1758,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;
@@ -2217,7 +2217,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);
@@ -2247,7 +2247,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_parse.cc

+2 −2
Original line number Diff line number Diff line
@@ -1001,8 +1001,8 @@ static int check_connection(THD *thd) 
  char *passwd= strend(user)+1;

  uint user_len= passwd - 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;



  /*