Commit 0eb7d8e4 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge work:/home/bk/mysql-4.0 

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
parents 0a3612aa fdc42017

myisam/mi_check.c

+2 −4
Original line number Diff line number Diff line
@@ -2947,14 +2947,12 @@ int sort_write_record(MI_SORT_PARAM *sort_param) 
  ulong block_length,reclength;

  byte *from;

  byte block_buff[8];

  MI_INFO *info;

  SORT_INFO *sort_info=sort_param->sort_info;

  MYISAM_SHARE *share;

  MI_CHECK *param=sort_info->param;

  MI_INFO *info=sort_info->info;

  MYISAM_SHARE *share=info->s;

  DBUG_ENTER("sort_write_record");



  info=sort_info->info;

  share=info->s;

  if (sort_param->fix_datafile)

  {

    switch (sort_info->new_data_file_type) {

myisam/myisamchk.c

+2 −1
Original line number Diff line number Diff line
@@ -1470,6 +1470,7 @@ static int mi_sort_records(MI_CHECK *param, 
  sort_info.info=info;

  sort_info.new_data_file_type=share->data_file_type;

  sort_param.fix_datafile=1;

  sort_param.master=1;

  sort_param.filepos=share->pack.header_length;

  old_record_count=info->state->records;

  info->state->records=0;