diff options
| author | unknown <monty@mysql.com> | 2004-12-18 06:05:16 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-12-18 06:05:16 +0200 |
| commit | e8b60b16121a68111e84c6a8671a3ebde9500d5d (patch) | |
| tree | 8e8581b17151730ec13c7ed6ec00128c62a192a8 /myisam/mi_open.c | |
| parent | 491baa972a2a2f373ae4dd3a1de2470169527326 (diff) | |
| parent | 8eaef91fff849885a7369a21a752e87cb1e592c8 (diff) | |
| download | mariadb-git-e8b60b16121a68111e84c6a8671a3ebde9500d5d.tar.gz | |
Merge with global tree
myisam/mi_key.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysys/my_handler.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
include/my_base.h:
Merge
Diffstat (limited to 'myisam/mi_open.c')
| -rw-r--r-- | myisam/mi_open.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/myisam/mi_open.c b/myisam/mi_open.c index 615e6bb5dd1..58db2e47c1f 100644 --- a/myisam/mi_open.c +++ b/myisam/mi_open.c @@ -314,7 +314,9 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) { disk_pos=mi_keyseg_read(disk_pos, pos); - if (pos->type == HA_KEYTYPE_TEXT || pos->type == HA_KEYTYPE_VARTEXT) + if (pos->type == HA_KEYTYPE_TEXT || + pos->type == HA_KEYTYPE_VARTEXT1 || + pos->type == HA_KEYTYPE_VARTEXT2) { if (!pos->language) pos->charset=default_charset_info; @@ -389,7 +391,9 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) for (j=0 ; j < share->uniqueinfo[i].keysegs; j++,pos++) { disk_pos=mi_keyseg_read(disk_pos, pos); - if (pos->type == HA_KEYTYPE_TEXT || pos->type == HA_KEYTYPE_VARTEXT) + if (pos->type == HA_KEYTYPE_TEXT || + pos->type == HA_KEYTYPE_VARTEXT1 || + pos->type == HA_KEYTYPE_VARTEXT2) { if (!pos->language) pos->charset=default_charset_info; |