summaryrefslogtreecommitdiff
path: root/sql/sql_db.cc
diff options
context:
space:
mode:
authorbar@bar.mysql.r18.ru <>2002-10-30 13:05:27 +0400
committerbar@bar.mysql.r18.ru <>2002-10-30 13:05:27 +0400
commitfef10d9bb1e24e592f86ec1425b60c900af4effd (patch)
tree02d07fa2fbe94da3a8fc0a957d5fd4908eeec89f /sql/sql_db.cc
parentc20b4891672f156287d98871b79386dd0dccf964 (diff)
downloadmariadb-git-fef10d9bb1e24e592f86ec1425b60c900af4effd.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);
}