diff options
| author | unknown <tomas@whalegate.ndb.mysql.com> | 2007-06-30 11:46:20 +0200 |
|---|---|---|
| committer | unknown <tomas@whalegate.ndb.mysql.com> | 2007-06-30 11:46:20 +0200 |
| commit | 21b6a3bc0e2d6c5d62bcd82334b0cbdb29da9ac1 (patch) | |
| tree | ffc95b0fad723216edfa7e810854d75280fc85cb /sql | |
| parent | 5d2af0c50de5ace2afbba0c1fe859a306ad831f0 (diff) | |
| parent | 3f59098a6e5a5d1e5735cf5a2ef6cabefd6c4372 (diff) | |
| download | mariadb-git-21b6a3bc0e2d6c5d62bcd82334b0cbdb29da9ac1.tar.gz | |
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/t/ndb_alter_table.test:
Auto merged
mysql-test/t/ndb_alter_table2.test:
Auto merged
mysql-test/t/ndb_alter_table3.test:
Auto merged
mysql-test/t/ndb_autodiscover3.test:
Auto merged
mysql-test/t/ndb_binlog_log_bin.test:
Auto merged
mysql-test/t/ndb_binlog_multi.test:
Auto merged
mysql-test/t/ndb_cache_multi.test:
Auto merged
mysql-test/t/ndb_cache_multi2.test:
Auto merged
mysql-test/t/ndb_single_user.test:
Auto merged
sql/ha_ndbcluster.cc:
SCCS merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 2b34eff8479..c78cb4e65b4 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -8976,6 +8976,14 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused))) thd->main_security_ctx.master_access= ~0; thd->main_security_ctx.priv_user = 0; + CHARSET_INFO *charset_connection; + charset_connection= get_charset_by_csname("utf8", + MY_CS_PRIMARY, MYF(MY_WME)); + thd->variables.character_set_client= charset_connection; + thd->variables.character_set_results= charset_connection; + thd->variables.collation_connection= charset_connection; + thd->update_charset(); + /* Signal successful initialization */ ndb_util_thread_running= 1; pthread_cond_signal(&COND_ndb_util_ready); |