diff options
| author | unknown <lars/lthalmann@dl145h.mysql.com> | 2006-10-25 17:12:09 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145h.mysql.com> | 2006-10-25 17:12:09 +0200 |
| commit | 36296ca91d3d20dc1993147c0c71bef8bad5bf82 (patch) | |
| tree | 1f4d6e9977fc116ed341a832871b12a1e15ac85f /storage/myisam/mi_open.c | |
| parent | 9852dfbcf5d3bfb5eec4316977b3d0d37761520e (diff) | |
| parent | a76c38148e9be9a2f915e2b461b0d7ad21ec0796 (diff) | |
| download | mariadb-git-36296ca91d3d20dc1993147c0c71bef8bad5bf82.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sql_show.cc:
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 7d1f18d3906..010f7233c32 100644 --- a/storage/myisam/mi_open.c +++ b/storage/myisam/mi_open.c @@ -348,6 +348,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) { |