Commit 1ec1fc44 authored by unknown's avatar unknown
Browse files

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 

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


sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
parents 2d48a1f2 1e641502

include/mysql_com.h

+1 −4
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ 
#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
@@ -36,7 +33,7 @@ 
  MySQL standard format:

  user_name_part@host_name_part\0

*/

#define USER_HOST_BUFF_SIZE HOSTNAME_LENGTH + USERNAME_BYTE_LENGTH + 2

#define USER_HOST_BUFF_SIZE HOSTNAME_LENGTH + USERNAME_LENGTH + 2



#define LOCAL_HOST	"localhost"

#define LOCAL_HOST_NAMEDPIPE "."

mysql-test/r/ctype_utf8.result

+0 −13
Original line number Diff line number Diff line
@@ -1340,19 +1340,6 @@ 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;

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

+0 −17
Original line number Diff line number Diff line
@@ -1069,23 +1069,6 @@ 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;

use test;



# End of 4.1 tests



#

sql-common/client.c

+3 −3
Original line number Diff line number Diff line
@@ -1753,7 +1753,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_BYTE_LEN+USERNAME_BYTE_LENGTH+100];

  char		buff[NAME_LEN+USERNAME_LENGTH+100];

  char		*end,*host_info;

  my_socket	sock;

  in_addr_t	ip_addr;
@@ -2212,7 +2212,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_BYTE_LENGTH);          /* Max user name */

    strmake(end,user,USERNAME_LENGTH);          /* Max user name */

  else

    read_user_name((char*) end);
@@ -2242,7 +2242,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_BYTE_LEN) + 1;

    end= strmake(end, db, NAME_LEN) + 1;

    mysql->db= my_strdup(db,MYF(MY_WME));

    db= 0;

  }

sql/log.h

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ class MYSQL_LOG 
  pthread_mutex_t LOCK_log;

  char *name;

  char log_file_name[FN_REFLEN];

  char time_buff[20], db[NAME_BYTE_LEN + 1];

  char time_buff[20], db[NAME_LEN + 1];

  bool write_error, inited;

  IO_CACHE log_file;

  enum_log_type log_type;