diff options
author | unknown <serg@serg.mysql.com> | 2003-01-21 19:37:38 +0100 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2003-01-21 19:37:38 +0100 |
commit | e7390ddc66ae7827d3b4e149a90cdefe7e30a90d (patch) | |
tree | dc179bb90999d1646faacdc7083e1f22900a0afc /include/myisam.h | |
parent | aec72f3315b1b0ddf1c9ca86555bbf26004a3a2e (diff) | |
parent | 76078f2c8417df4695f14b75fc4711417d1f3c08 (diff) | |
download | mariadb-git-e7390ddc66ae7827d3b4e149a90cdefe7e30a90d.tar.gz |
merged
include/myisam.h:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_create.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
Diffstat (limited to 'include/myisam.h')
-rw-r--r-- | include/myisam.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/myisam.h b/include/myisam.h index 5c4a5345d37..e06f9fc37ca 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -342,6 +342,12 @@ typedef struct st_mi_check_param char *op_name; } MI_CHECK; +typedef struct st_sort_ft_buf +{ + uchar *buf, *end; + int count; + uchar lastkey[MI_MAX_KEY_BUFF]; +} SORT_FT_BUF; typedef struct st_sort_info { @@ -354,7 +360,8 @@ typedef struct st_sort_info MI_CHECK *param; char *buff; SORT_KEY_BLOCKS *key_block,*key_block_end; - /* sync things*/ + SORT_FT_BUF *ft_buf; + /* sync things */ uint got_error, threads_running; pthread_mutex_t mutex; pthread_cond_t cond; |