diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-05 12:48:02 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-05 12:48:02 +0200 |
| commit | e80bcd7f64fc8ff6f46c1fc0d01e9c0b0fd03064 (patch) | |
| tree | 0716fe20a806adbe55581d9e996f29dcb3a5ab0b /sql/sql_connect.cc | |
| parent | 7075d7fce626ee915c9ae9308cfb4a8120e83e44 (diff) | |
| parent | ab2458c61fab2d8e6ead63577af434738874f1cf (diff) | |
| download | mariadb-git-e80bcd7f64fc8ff6f46c1fc0d01e9c0b0fd03064.tar.gz | |
Merge 10.3 into 10.4
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 ac2503d29ff..5adf5c75600 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -800,6 +800,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; |