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:29:33 +0100 |
| commit | e214aa1cd35d282c27c1888bcd6cf943340c67ff (patch) | |
| tree | 52968f0055558b5dda022c4906b392a8912aab71 /sql/sql_connect.cc | |
| parent | 14a58cea59a8c173923ad1cde9516e6c01ac0ef9 (diff) | |
| download | mariadb-git-e214aa1cd35d282c27c1888bcd6cf943340c67ff.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 b48070b9c8f..6881ca5956e 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -796,6 +796,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; |