diff options
| author | hf@deer.mysql.r18.ru <> | 2002-12-19 14:57:24 +0400 |
|---|---|---|
| committer | hf@deer.mysql.r18.ru <> | 2002-12-19 14:57:24 +0400 |
| commit | 8a205e4ba309c4031df93cfe700891d362e25750 (patch) | |
| tree | 49af941597a25a7ac4b9152abdbeba746334ac2e /sql/sql_class.cc | |
| parent | 1873df00a5c8d3a92086623db3dd90bfec4b5221 (diff) | |
| parent | c3053148f489b36378efa3bdf6676ca0334f69d1 (diff) | |
| download | mariadb-git-8a205e4ba309c4031df93cfe700891d362e25750.tar.gz | |
Merge
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index a4cd34e7856..e43fb0d3a0b 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -105,7 +105,6 @@ THD::THD():user_time(0), fatal_error(0), cond_count=0; warn_id= 0; db_charset=default_charset_info; - thd_charset=default_charset_info; mysys_var=0; #ifndef DBUG_OFF dbug_sentry=THD_SENTRY_MAGIC; @@ -192,6 +191,7 @@ void THD::init(void) { pthread_mutex_lock(&LOCK_global_system_variables); variables= global_system_variables; + variables.thd_charset=default_charset_info; pthread_mutex_unlock(&LOCK_global_system_variables); server_status= SERVER_STATUS_AUTOCOMMIT; options= thd_startup_options; |