diff options
| author | unknown <bar@mysql.com> | 2005-09-05 20:00:11 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-09-05 20:00:11 +0500 |
| commit | 50c44c9b529aaa694faaacf4353e1815b6133941 (patch) | |
| tree | e40d0928523fd9758d1526423b285394893028de /sql/sql_parse.cc | |
| parent | 969391784f305027466d0d79b271311f22bc583b (diff) | |
| download | mariadb-git-50c44c9b529aaa694faaacf4353e1815b6133941.tar.gz | |
mysqld.cc, mysql_priv.h, sql_parse.cc:
bug#9948
changed client-charset behavior in 4.1.x libmysql, which issue BC prob
after review fixes
sql/mysql_priv.h:
bug#9948
changed client-charset behavior in 4.1.x libmysql, which issue BC prob
after review fixes
sql/mysqld.cc:
bug#9948
changed client-charset behavior in 4.1.x libmysql, which issue BC prob
after review fixes
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index b8eae3aac74..a52e6daa698 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -811,12 +811,12 @@ 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 + - 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 (opt_skip_character_set_client_handshake || + 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, |