database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge mysql.com:/usr/home/bar/mysql-4.1.b9948

Browse Source 
into  mysql.com:/usr/home/bar/mysql-5.0
This commit is contained in:
bar@mysql.com
2005-09-06 14:35:36 +05:00
parent 891885e9c2 6a5f00702d
commit 51d0e0bc30
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@@ -875,11 +875,13 @@ static int check_connection(THD *thd)
DBUG_PRINT("info", ("client_character_set: %d", (uint) net->read_pos[8]));
/*
Use server character set and collation if
- opt_character_set_client_handshake is not set
- client has not specified a character set
- client character set is the same as the servers
- client character set doesn't exists in server
*/
if (!(thd->variables.character_set_client=
if (!opt_character_set_client_handshake ||
!(thd->variables.character_set_client=
get_charset((uint) net->read_pos[8], MYF(0))) ||
!my_strcasecmp(&my_charset_latin1,
global_system_variables.character_set_client->name,