diff options
| author | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-10-12 09:40:01 +0500 |
|---|---|---|
| committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-10-12 09:40:01 +0500 |
| commit | 27bbf36f87138ee434f629756a543fa7caf9f789 (patch) | |
| tree | 2e58997805bb44e99a0c374991a137ac28293f70 /storage/myisam/mi_open.c | |
| parent | c34940a0786f472ab3d1797c6cd97228b1ee49f5 (diff) | |
| parent | 3daec06dae2d275e485cde129ff718746c9b27a3 (diff) | |
| download | mariadb-git-27bbf36f87138ee434f629756a543fa7caf9f789.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0-rpl.b22052
into mysql.com:/usr/home/bar/mysql-5.1-rpl
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
Diffstat (limited to 'storage/myisam/mi_open.c')
| -rw-r--r-- | storage/myisam/mi_open.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/myisam/mi_open.c b/storage/myisam/mi_open.c index 1675c596860..5814184d61d 100644 --- a/storage/myisam/mi_open.c +++ b/storage/myisam/mi_open.c @@ -345,6 +345,8 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) goto err; } } + else if (pos->type == HA_KEYTYPE_BINARY) + pos->charset= &my_charset_bin; } if (share->keyinfo[i].flag & HA_SPATIAL) { |