Commit dc6243e5 authored by unknown's avatar unknown
Browse files

after merge fix 


include/mysql_com.h:
  USERNAME_LENGTH is changed to USERNAME_BYTE_LENGTH
mysql-test/r/ctype_utf8.result:
  result fix
mysql-test/t/ctype_utf8.test:
  test fix
sql/sp.cc:
  NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
  USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer
sql/sp_head.cc:
  NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
  USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer
sql/sql_acl.cc:
  NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
  USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer
sql/sql_class.h:
  NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
sql/sql_parse.cc:
  NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
  Function check_string_length() is fixed, now it check string lenght in symbols
sql/sql_repl.h:
  NAME_LEN constant is changed to NAME_BYTE_LEN for database name buffer
  USERNAME_LENGTH constant is changed to USERNAME_BYTE_LENGTH for user name buffer
parent 146049d2

include/mysql_com.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
  MySQL standard format:

  user_name_part@host_name_part\0

*/

#define USER_HOST_BUFF_SIZE HOSTNAME_LENGTH + USERNAME_LENGTH + 2

#define USER_HOST_BUFF_SIZE HOSTNAME_LENGTH + USERNAME_BYTE_LENGTH + 2



#define LOCAL_HOST	"localhost"

#define LOCAL_HOST_NAMEDPIPE "."

mysql-test/r/ctype_utf8.result

+9 −8
Original line number Diff line number Diff line
@@ -1341,17 +1341,18 @@ a 
e

drop table t1;

set names utf8;

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

grant select on test.* to юзер_юзер@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;

юзер_юзер@localhost

revoke all on test.* from юзер_юзер@localhost;

drop user юзер_юзер@localhost;

create database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;

use имя_базы_в_кодировке_утф8_длиной_больше_чем_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;

имя_базы_в_кодировке_утф8_длиной_больше_чем_45

drop database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;

use test;

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

+1 −0
Original line number Diff line number Diff line
@@ -1084,6 +1084,7 @@ create database имя_базы_в_кодировке_утф8_длиной_бо 
use имя_базы_в_кодировке_утф8_длиной_больше_чем_45;

select database();

drop database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;

use test;



# End of 4.1 tests

sql/sp.cc

+4 −4
Original line number Diff line number Diff line
@@ -404,16 +404,16 @@ db_load_routine(THD *thd, int type, sp_name *name, sp_head **sphp, 
{

  LEX *old_lex= thd->lex, newlex;

  String defstr;

  char old_db_buf[NAME_LEN+1];

  char old_db_buf[NAME_BYTE_LEN+1];

  LEX_STRING old_db= { old_db_buf, sizeof(old_db_buf) };

  bool dbchanged;

  ulong old_sql_mode= thd->variables.sql_mode;

  ha_rows old_select_limit= thd->variables.select_limit;

  sp_rcontext *old_spcont= thd->spcont;

  

  char definer_user_name_holder[USERNAME_LENGTH + 1];

  char definer_user_name_holder[USERNAME_BYTE_LENGTH + 1];

  LEX_STRING_WITH_INIT definer_user_name(definer_user_name_holder,

                                         USERNAME_LENGTH);

                                         USERNAME_BYTE_LENGTH);



  char definer_host_name_holder[HOSTNAME_LENGTH + 1];

  LEX_STRING_WITH_INIT definer_host_name(definer_host_name_holder,
@@ -511,7 +511,7 @@ db_create_routine(THD *thd, int type, sp_head *sp) 
  int ret;

  TABLE *table;

  char definer[USER_HOST_BUFF_SIZE];

  char old_db_buf[NAME_LEN+1];

  char old_db_buf[NAME_BYTE_LEN+1];

  LEX_STRING old_db= { old_db_buf, sizeof(old_db_buf) };

  bool dbchanged;

  DBUG_ENTER("db_create_routine");

sql/sp_head.cc

+3 −3
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ bool 
sp_head::execute(THD *thd)

{

  DBUG_ENTER("sp_head::execute");

  char old_db_buf[NAME_LEN+1];

  char old_db_buf[NAME_BYTE_LEN+1];

  LEX_STRING old_db= { old_db_buf, sizeof(old_db_buf) };

  bool dbchanged;

  sp_rcontext *ctx;
@@ -1957,8 +1957,8 @@ sp_head::set_info(longlong created, longlong modified, 
void

sp_head::set_definer(const char *definer, uint definerlen)

{

  char user_name_holder[USERNAME_LENGTH + 1];

  LEX_STRING_WITH_INIT user_name(user_name_holder, USERNAME_LENGTH);

  char user_name_holder[USERNAME_BYTE_LENGTH + 1];

  LEX_STRING_WITH_INIT user_name(user_name_holder, USERNAME_BYTE_LENGTH);



  char host_name_holder[HOSTNAME_LENGTH + 1];

  LEX_STRING_WITH_INIT host_name(host_name_holder, HOSTNAME_LENGTH);