diff options
| author | unknown <bar@mysql.com> | 2005-08-31 13:03:24 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-08-31 13:03:24 +0500 |
| commit | 969391784f305027466d0d79b271311f22bc583b (patch) | |
| tree | f47af26dbec80ee5f1738adb9f8dfc4a1ca8dc55 /sql/sql_parse.cc | |
| parent | f17853cb8512ee857e5617f9141e886b4cf74f60 (diff) | |
| download | mariadb-git-969391784f305027466d0d79b271311f22bc583b.tar.gz | |
bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
sql_parse.cc:
mysqld.cc:
Added --skip-client-character-set-handshake.
When this option is activated, client side character set
(which is sent in handshake) is ignored, and server side
default-character-set value is used for character_set_client
and character_set_results, thus reprodicing 4.0 behaviour.
sql/mysqld.cc:
bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
Added --skip-client-character-set-handshake,
to reproduce 4.0 behaviour.
sql/sql_parse.cc:
bug#9948 changed client-charset behavior in 4.1.x libmysql, which issue BC prob
Added --skip-client-character-set-handshake,
to reproduce 4.0 behaviour.
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index caf76b19eb2..b8eae3aac74 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -811,11 +811,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_skip_character_set_client_handshake is 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_skip_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, |