Commit 2ffd9699 authored by unknown's avatar unknown

MI_SORT_INFO and MI_SORT_PARAM massaging

parent 65366ce7
...@@ -354,15 +354,15 @@ typedef struct st_mi_check_param ...@@ -354,15 +354,15 @@ typedef struct st_mi_check_param
typedef struct st_sort_info typedef struct st_sort_info
{ {
MI_INFO *info;
MI_CHECK *param;
enum data_file_type new_data_file_type;
SORT_KEY_BLOCKS *key_block,*key_block_end;
uint current_key, total_keys;
my_off_t filelength,dupp,buff_length; my_off_t filelength,dupp,buff_length;
ha_rows max_records; ha_rows max_records;
char *buff; uint current_key, total_keys;
myf myf_rw; myf myf_rw;
enum data_file_type new_data_file_type;
MI_INFO *info;
MI_CHECK *param;
char *buff;
SORT_KEY_BLOCKS *key_block,*key_block_end;
/* sync things*/ /* sync things*/
uint got_error, threads_running; uint got_error, threads_running;
pthread_mutex_t mutex; pthread_mutex_t mutex;
...@@ -373,20 +373,19 @@ typedef struct st_sort_info ...@@ -373,20 +373,19 @@ typedef struct st_sort_info
typedef struct st_mi_sort_param typedef struct st_mi_sort_param
{ {
pthread_t thr; pthread_t thr;
IO_CACHE read_cache; IO_CACHE read_cache, tempfile, tempfile_for_exceptions;
DYNAMIC_ARRAY buffpek;
ulonglong unique[MI_MAX_KEY_SEG+1]; ulonglong unique[MI_MAX_KEY_SEG+1];
my_off_t pos,max_pos,filepos,start_recpos;
uint key, key_length,real_key_length,sortbuff_size; uint key, key_length,real_key_length,sortbuff_size;
uint maxbuffers, keys, find_length, sort_keys_length; uint maxbuffers, keys, find_length, sort_keys_length;
uchar **sort_keys;
byte *rec_buff;
uint alloced_rec_buff_length; uint alloced_rec_buff_length;
void *wordlist, *wordptr; my_bool fix_datafile, master;
MI_KEYDEF *keyinfo; MI_KEYDEF *keyinfo;
SORT_INFO *sort_info; SORT_INFO *sort_info;
IO_CACHE tempfile, tempfile_for_exceptions; uchar **sort_keys;
DYNAMIC_ARRAY buffpek; byte *rec_buff;
my_off_t pos,max_pos,filepos,start_recpos; void *wordlist, *wordptr;
my_bool fix_datafile, master;
char *record; char *record;
char *tmpdir; char *tmpdir;
int (*key_cmp)(struct st_mi_sort_param *, const void *, const void *); int (*key_cmp)(struct st_mi_sort_param *, const void *, const void *);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment