diff options
| author | unknown <istruewing@chilla.local> | 2006-12-01 18:38:08 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-12-01 18:38:08 +0100 |
| commit | ec74c400648255d482f357339ff7f3a7cb102ebd (patch) | |
| tree | c9c2e3e9df14ab3bda90f73a603e6be6667f645d /sql/ha_federated.cc | |
| parent | 4615743857582db41ee2c2767df0690bf0cb586e (diff) | |
| parent | 56ecc18f971ab2f20e87d344af2489e0ed89aec7 (diff) | |
| download | mariadb-git-ec74c400648255d482f357339ff7f3a7cb102ebd.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into chilla.local:/home/mydev/mysql-5.0-axmrg
sql/ha_federated.cc:
Auto merged
Diffstat (limited to 'sql/ha_federated.cc')
| -rw-r--r-- | sql/ha_federated.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc index 8be1e40f42d..923ee7a232f 100644 --- a/sql/ha_federated.cc +++ b/sql/ha_federated.cc @@ -1435,6 +1435,16 @@ int ha_federated::open(const char *name, int mode, uint test_if_locked) /* Connect to foreign database mysql_real_connect() */ mysql= mysql_init(0); + + /* + BUG# 17044 Federated Storage Engine is not UTF8 clean + Add set names to whatever charset the table is at open + of table + */ + /* this sets the csname like 'set names utf8' */ + mysql_options(mysql,MYSQL_SET_CHARSET_NAME, + this->table->s->table_charset->csname); + if (!mysql || !mysql_real_connect(mysql, share->hostname, share->username, @@ -1451,6 +1461,7 @@ int ha_federated::open(const char *name, int mode, uint test_if_locked) API silently reconnect. For future versions, we will need more logic to deal with transactions */ + mysql->reconnect= 1; ref_length= (table->s->primary_key != MAX_KEY ? |