diff options
| author | unknown <istruewing@chilla.local> | 2006-12-01 23:01:33 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-12-01 23:01:33 +0100 |
| commit | 1b18562059806ba4aab585ff2cb540e88bb6c7c8 (patch) | |
| tree | 696675b32290cfe770736dd7dfe8dbde7a93596a /storage | |
| parent | cb2329d63802f14eca7db89db5d4353043b65dbc (diff) | |
| parent | d337e90e8c9422a98e502e71d73326a428ed8cfa (diff) | |
| download | mariadb-git-1b18562059806ba4aab585ff2cb540e88bb6c7c8.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into chilla.local:/home/mydev/mysql-5.1-axmrg
configure.in:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/t/federated.test:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/federated/ha_federated.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 7330a19b791..4baa95df8fd 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -1450,6 +1450,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, @@ -1466,6 +1476,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 ? |