Commit 6d77ba47 authored by unknown's avatar unknown
Browse files

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

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


sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/table.cc:
  Auto merged
include/mysql_com.h:
  manual merge
mysql-test/r/ctype_utf8.result:
  manual merge
mysql-test/t/ctype_utf8.test:
  manual merge
sql/sql_acl.cc:
  manual merge
parents 3436f0ac abd883f4

include/mysql_com.h

+0 −3
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

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
@@ -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_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;
@@ -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_BYTE_LENGTH);          /* Max user name */

    strmake(end,user,USERNAME_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_BYTE_LEN) + 1;

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

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

    db= 0;

  }

sql/sql_acl.cc

+5 −4
Original line number Diff line number Diff line
@@ -3232,10 +3232,11 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list, 
      result= TRUE;

      continue;

    }  

    if (replace_user_table(thd, tables[0].table, *Str,

                           (!db ? rights : 0), revoke_grant, create_new_users,

                           test(thd->variables.sql_mode &

                                MODE_NO_AUTO_CREATE_USER)))

    if ((replace_user_table(thd,

			    tables[0].table,

			    *Str,

			    (!db ? rights : 0), revoke_grant,

			    create_new_users)))

      result= -1;

    else if (db)

    {