diff options
| author | unknown <lars/lthalmann@mysql.com/dl145h.mysql.com> | 2006-10-25 17:10:18 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145h.mysql.com> | 2006-10-25 17:10:18 +0200 |
| commit | a0efc901bbf64916b7efef60fa2e7c7259cde921 (patch) | |
| tree | 8499457413d632c905ec10c6a6068ea45e1e6d1a /myisam/mi_open.c | |
| parent | ab133655360a284567b74be79765031493823479 (diff) | |
| parent | 00a34b626379d26507c3f4877e11edbe3722321f (diff) | |
| download | mariadb-git-a0efc901bbf64916b7efef60fa2e7c7259cde921.tar.gz | |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
myisam/mi_open.c:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'myisam/mi_open.c')
| -rw-r--r-- | myisam/mi_open.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c index a52ab5aad1f..bf20eb3f270 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -336,6 +336,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) { |