summaryrefslogtreecommitdiff
path: root/sql/sql_db.cc
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2002-10-30 13:05:27 +0400
committerunknown <bar@bar.mysql.r18.ru>2002-10-30 13:05:27 +0400
commite086000f196ac3314e736d1bb8cacccdaff8412f (patch)
tree02d07fa2fbe94da3a8fc0a957d5fd4908eeec89f /sql/sql_db.cc
parent75dc4d5ce55fde21938ec686a9869ff549004f5a (diff)
downloadmariadb-git-e086000f196ac3314e736d1bb8cacccdaff8412f.tar.gz
Preparation to thread specific default charset
Diffstat (limited to 'sql/sql_db.cc')
-rw-r--r--sql/sql_db.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 58b12bca00d..25a69f7e51b 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -592,7 +592,7 @@ bool mysql_change_db(THD *thd, const char *name)
strmov(path+unpack_dirname(path,path), MY_DB_OPT_FILE);
load_db_opt(path, &create);
thd->db_charset=create.table_charset;
-
+ thd->thd_charset=thd->db_charset ? thd->db_charset : default_charset_info;
DBUG_RETURN(0);
}