1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-2

Browse Source 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


sql/sql_parse.cc:
  manually merged
This commit is contained in:
unknown 2007-06-12 08:56:00 -04:00
commit 21e0716498
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_parse.cc
View File

@ -784,12 +784,15 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
Old clients send null-terminated string ('\0' for empty string) for Old clients send null-terminated string ('\0' for empty string) for
password. New clients send the size (1 byte) + string (not null password. New clients send the size (1 byte) + string (not null
terminated, so also '\0' for empty string). terminated, so also '\0' for empty string).
Cast *passwd to an unsigned char, so that it doesn't extend the sign
for *passwd > 127 and become 2**32-127 after casting to uint.
*/ */
char db_buff[NAME_LEN+1]; // buffer to store db in utf8 char db_buff[NAME_LEN+1]; // buffer to store db in utf8
char *db= passwd; char *db= passwd;
char *save_db; char *save_db;
uint passwd_len= (thd->client_capabilities & CLIENT_SECURE_CONNECTION ? uint passwd_len= (thd->client_capabilities & CLIENT_SECURE_CONNECTION ?
*passwd++ : strlen(passwd)); (uchar)(*passwd++) : strlen(passwd));
uint dummy_errors, save_db_length, db_length; uint dummy_errors, save_db_length, db_length;
int res; int res;
Security_context save_security_ctx= *thd->security_ctx; Security_context save_security_ctx= *thd->security_ctx;