diff options
| author | unknown <gluh@mysql.com/gluh.(none)> | 2006-09-27 18:06:46 +0500 |
|---|---|---|
| committer | unknown <gluh@mysql.com/gluh.(none)> | 2006-09-27 18:06:46 +0500 |
| commit | 6d77ba47e5a7dfc54b02635a3133c5b617aaec72 (patch) | |
| tree | e96377e9f3f5a868efad3b6ac8a49591257dc883 /sql-common | |
| parent | 3436f0acc1206c2614ee280b79e295c8deace91f (diff) | |
| parent | abd883f4d02e6d32c4ac0446345bd27c2455db55 (diff) | |
| download | mariadb-git-6d77ba47e5a7dfc54b02635a3133c5b617aaec72.tar.gz | |
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
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index fc483e7b4c7..cfd53fb1012 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -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; } |