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

BUG#30472: libmysql doesn't reset charset, insert_id after

Browse Source 
succ. mysql_change_user() call.

Use 2 bytes for character set number.
This commit is contained in:
unknown 2007-10-01 15:41:18 +04:00
parent 3175946b75
commit 11476cfc04
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmysql/libmysql.c
View File

@ -736,8 +736,8 @@ my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user,
if (mysql->server_capabilities & CLIENT_SECURE_CONNECTION) if (mysql->server_capabilities & CLIENT_SECURE_CONNECTION)
{ {
*end= (uchar) mysql->charset->number; int2store(end, (ushort) mysql->charset->number);
++end; end+= 2;
} }
/* Write authentication package */ /* Write authentication package */

13
sql/sql_parse.cc
View File

@ -878,10 +878,19 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
} }
db_length= strlen(db); db_length= strlen(db);
char *ptr= db + db_length + 1;
uint cs_number= 0; uint cs_number= 0;
if (db + db_length < packet_end) if (ptr < packet_end)
cs_number= (uchar) *(db + db_length + 1); {
if (ptr + 2 > packet_end)
{
my_message(ER_UNKNOWN_COM_ERROR, ER(ER_UNKNOWN_COM_ERROR), MYF(0));
break;
}
cs_number= uint2korr(ptr);
}
/* Convert database name to utf8 */ /* Convert database name to utf8 */
db_buff[copy_and_convert(db_buff, sizeof(db_buff)-1, db_buff[copy_and_convert(db_buff, sizeof(db_buff)-1,