Commit 7a804530 authored by unknown's avatar unknown

Merge work:/home/bk/mysql-4.0

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

parents f3558eee 31b0520e
...@@ -2947,14 +2947,12 @@ int sort_write_record(MI_SORT_PARAM *sort_param) ...@@ -2947,14 +2947,12 @@ int sort_write_record(MI_SORT_PARAM *sort_param)
ulong block_length,reclength; ulong block_length,reclength;
byte *from; byte *from;
byte block_buff[8]; byte block_buff[8];
MI_INFO *info;
SORT_INFO *sort_info=sort_param->sort_info; SORT_INFO *sort_info=sort_param->sort_info;
MYISAM_SHARE *share;
MI_CHECK *param=sort_info->param; MI_CHECK *param=sort_info->param;
MI_INFO *info=sort_info->info;
MYISAM_SHARE *share=info->s;
DBUG_ENTER("sort_write_record"); DBUG_ENTER("sort_write_record");
info=sort_info->info;
share=info->s;
if (sort_param->fix_datafile) if (sort_param->fix_datafile)
{ {
switch (sort_info->new_data_file_type) { switch (sort_info->new_data_file_type) {
......
...@@ -72,7 +72,7 @@ static void descript(MI_CHECK *param, register MI_INFO *info, my_string name); ...@@ -72,7 +72,7 @@ static void descript(MI_CHECK *param, register MI_INFO *info, my_string name);
static int mi_sort_records(MI_CHECK *param, register MI_INFO *info, static int mi_sort_records(MI_CHECK *param, register MI_INFO *info,
my_string name, uint sort_key, my_string name, uint sort_key,
my_bool write_info, my_bool update_index); my_bool write_info, my_bool update_index);
static int sort_record_index(MI_SORT_PARAM *sort_param,MI_INFO *info, static int sort_record_index(MI_SORT_PARAM *sort_param, MI_INFO *info,
MI_KEYDEF *keyinfo, MI_KEYDEF *keyinfo,
my_off_t page,uchar *buff,uint sortkey, my_off_t page,uchar *buff,uint sortkey,
File new_file, my_bool update_index); File new_file, my_bool update_index);
...@@ -1470,6 +1470,7 @@ static int mi_sort_records(MI_CHECK *param, ...@@ -1470,6 +1470,7 @@ static int mi_sort_records(MI_CHECK *param,
sort_info.info=info; sort_info.info=info;
sort_info.new_data_file_type=share->data_file_type; sort_info.new_data_file_type=share->data_file_type;
sort_param.fix_datafile=1; sort_param.fix_datafile=1;
sort_param.master=1;
sort_param.filepos=share->pack.header_length; sort_param.filepos=share->pack.header_length;
old_record_count=info->state->records; old_record_count=info->state->records;
info->state->records=0; info->state->records=0;
......
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