diff options
| author | Georgi Kodinov <kgeorge@mysql.com> | 2008-11-28 16:32:04 +0200 |
|---|---|---|
| committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-11-28 16:32:04 +0200 |
| commit | f1a9d567c1535f4829e0b3b078b24c0e8c5c437c (patch) | |
| tree | fc45d4f17785e5620b3ae6fc1dde728094c25cda /sql/mysqld.cc | |
| parent | fef07511e3c950438931e23eb286bf5638345700 (diff) | |
| parent | 8e688a7a0246d16a8c636262872a6e7b06376b99 (diff) | |
| download | mariadb-git-f1a9d567c1535f4829e0b3b078b24c0e8c5c437c.tar.gz | |
merged bug 37339 to 5.0-bugteam
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index ba6c8c6169f..8232cefc880 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3035,12 +3035,14 @@ static int init_common_variables(const char *conf_file_name, int argc, sys_init_connect.value_length= strlen(opt_init_connect); else sys_init_connect.value=my_strdup("",MYF(0)); + sys_init_connect.is_os_charset= TRUE; sys_init_slave.value_length= 0; if ((sys_init_slave.value= opt_init_slave)) sys_init_slave.value_length= strlen(opt_init_slave); else sys_init_slave.value=my_strdup("",MYF(0)); + sys_init_slave.is_os_charset= TRUE; if (use_temp_pool && bitmap_init(&temp_pool,0,1024,1)) return 1; |