diff options
| author | gluh@gluh.(none) <> | 2006-09-28 14:09:31 +0500 |
|---|---|---|
| committer | gluh@gluh.(none) <> | 2006-09-28 14:09:31 +0500 |
| commit | b7e59b7085b3d782c06fb1a5cf8b1f639699c33d (patch) | |
| tree | 73252a3a983ef93143ce19885f926adef37d149d /sql-common | |
| parent | 5e2f69d1ddda97c2de3d4c9cb52282e81cb518c1 (diff) | |
| parent | 4aaf7e34ff45f084234b007b68fb4e0f892ca625 (diff) | |
| download | mariadb-git-b7e59b7085b3d782c06fb1a5cf8b1f639699c33d.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.1
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 6722597531d..79a5be938b2 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -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; } |