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_class.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_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 2efdf91f6a9..85c29b6b661 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -847,6 +847,7 @@ THD::THD(my_thread_id id, bool is_wsrep_applier, bool skip_global_sys_var_lock) prepare_derived_at_open= FALSE; create_tmp_table_for_derived= FALSE; save_prep_leaf_list= FALSE; + org_charset= 0; /* Restore THR_THD */ set_current_thd(old_THR_THD); inc_thread_count(); |