diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 18:51:00 +0100 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-02-12 18:51:00 +0100 |
| commit | 998b4ae52d72010513035c969ff938d5d79c640c (patch) | |
| tree | 88ca7a14047d5229de9b4da4b488867145c64940 /storage/maria/ma_open.c | |
| parent | b90ff5340fc10a9306be1b1201612e382b8ab051 (diff) | |
| download | mariadb-git-998b4ae52d72010513035c969ff938d5d79c640c.tar.gz | |
Merge of MyISAM changes done in 5.1-main, into Maria
Diffstat (limited to 'storage/maria/ma_open.c')
| -rw-r--r-- | storage/maria/ma_open.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/maria/ma_open.c b/storage/maria/ma_open.c index c6c786910db..cc004c23a25 100644 --- a/storage/maria/ma_open.c +++ b/storage/maria/ma_open.c @@ -537,6 +537,7 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags) share->block_size= share->base.block_size; /* Convenience */ { HA_KEYSEG *pos=share->keyparts; + uint32 ftkey_nr= 1; for (i=0 ; i < keys ; i++) { share->keyinfo[i].share= share; @@ -609,6 +610,7 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags) share->ft2_keyinfo.end=pos; setup_key_functions(& share->ft2_keyinfo); } + share->keyinfo[i].ftkey_nr= ftkey_nr++; } setup_key_functions(share->keyinfo+i); share->keyinfo[i].end=pos; @@ -646,7 +648,7 @@ MARIA_HA *maria_open(const char *name, int mode, uint open_flags) pos->flag=0; pos++; } - share->ftparsers= 0; + share->ftkeys= ftkey_nr; } share->data_file_type= share->state.header.data_file_type; share->base_length= (BASE_ROW_HEADER_SIZE + @@ -1527,7 +1529,7 @@ uchar *_ma_keydef_read(uchar *ptr, MARIA_KEYDEF *keydef) keydef->underflow_block_length=keydef->block_length/3; keydef->version = 0; /* Not saved */ keydef->parser = &ft_default_parser; - keydef->ftparser_nr = 0; + keydef->ftkey_nr = 0; return ptr; } |