diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-02-02 10:02:03 +0100 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-02-02 17:32:15 +0100 |
commit | 261ce5286f266f1a5fab5e8adc2c08adef658d13 (patch) | |
tree | 8f74ae3a7b7e4aed0b1f106082e98d66ad659774 /sql/sql_connect.cc | |
parent | 915ed7e614383093d688db6b4fd8bc7b948e1b70 (diff) | |
download | mariadb-git-261ce5286f266f1a5fab5e8adc2c08adef658d13.tar.gz |
MDEV-18281 COM_RESET_CONNECTION changes the connection encoding
Store original charset during client authentication, and restore it for
COM_RESET_CONNECTION
Diffstat (limited to 'sql/sql_connect.cc')
-rw-r--r-- | sql/sql_connect.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 99fc1e8c1aa..278677b8b2d 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -793,6 +793,7 @@ bool thd_init_client_charset(THD *thd, uint cs_number) cs->csname); return true; } + thd->org_charset= cs; thd->update_charset(cs,cs,cs); } return false; |