Commit 203bb8bc authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/mysqldump.result:
  Auto merged
parents 3a806cd6 f4ec1ed5

myisam/mi_check.c

+5 −5
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ int chk_data_link(MI_CHECK *param, MI_INFO *info,int extend) 
			 "Keypointers and record positions doesn't match");

    error=1;

  }

  else if (param->glob_crc != info->s->state.checksum &&

  else if (param->glob_crc != info->state->checksum &&

	   (info->s->options &

	    (HA_OPTION_CHECKSUM | HA_OPTION_COMPRESS_RECORD)))

  {
@@ -1388,7 +1388,7 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info, 
    info->state->data_file_length=sort_param.max_pos;

  }

  if (param->testflag & T_CALC_CHECKSUM)

    share->state.checksum=param->glob_crc;

    info->state->checksum=param->glob_crc;



  if (!(param->testflag & T_SILENT))

  {
@@ -2156,7 +2156,7 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, 
			       my_errno);

  }

  if (param->testflag & T_CALC_CHECKSUM)

    share->state.checksum=param->glob_crc;

    info->state->checksum=param->glob_crc;



  if (my_chsize(share->kfile,info->state->key_file_length,0,MYF(0)))

    mi_check_print_warning(param,
@@ -2577,7 +2577,7 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info, 
			       my_errno);

  }

  if (param->testflag & T_CALC_CHECKSUM)

    share->state.checksum=param->glob_crc;

    info->state->checksum=param->glob_crc;



  if (my_chsize(share->kfile,info->state->key_file_length,0,MYF(0)))

    mi_check_print_warning(param,
@@ -3808,7 +3808,7 @@ int recreate_table(MI_CHECK *param, MI_INFO **org_info, char *filename) 
    (*org_info)->s->state.create_time=share.state.create_time;

  (*org_info)->s->state.unique=(*org_info)->this_unique=

    share.state.unique;

  (*org_info)->s->state.checksum=share.state.checksum;

  (*org_info)->state->checksum=info.state->checksum;

  (*org_info)->state->del=info.state->del;

  (*org_info)->s->state.dellink=share.state.dellink;

  (*org_info)->state->empty=info.state->empty;

myisam/mi_delete.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ int mi_delete(MI_INFO *info,const byte *record) 


  if ((*share->delete_record)(info))

    goto err;				/* Remove record from database */

  info->s->state.checksum-=info->checksum;

  info->state->checksum-=info->checksum;



  info->update= HA_STATE_CHANGED+HA_STATE_DELETED+HA_STATE_ROW_CHANGED;

  info->state->records--;

myisam/mi_delete_all.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ int mi_delete_all_rows(MI_INFO *info) 
  info->state->key_file_length=share->base.keystart;

  info->state->data_file_length=0;

  info->state->empty=info->state->key_empty=0;

  state->checksum=0;

  info->state->checksum=0;



  for (i=share->base.max_key_block_length/MI_MIN_KEY_BLOCK_LENGTH ; i-- ; )

    state->key_del[i]= HA_OFFSET_ERROR;

myisam/mi_open.c

+2 −2
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ uint mi_state_info_write(File file, MI_STATE_INFO *state, uint pWrite) 
  mi_sizestore(ptr,state->state.empty);		ptr +=8;

  mi_sizestore(ptr,state->state.key_empty);	ptr +=8;

  mi_int8store(ptr,state->auto_increment);	ptr +=8;

  mi_int8store(ptr,(ulonglong) state->checksum);ptr +=8;

  mi_int8store(ptr,(ulonglong) state->state.checksum);ptr +=8;

  mi_int4store(ptr,state->process);		ptr +=4;

  mi_int4store(ptr,state->unique);		ptr +=4;

  mi_int4store(ptr,state->status);		ptr +=4;
@@ -884,7 +884,7 @@ char *mi_state_info_read(uchar *ptr, MI_STATE_INFO *state) 
  state->state.empty	= mi_sizekorr(ptr);	ptr +=8;

  state->state.key_empty= mi_sizekorr(ptr);	ptr +=8;

  state->auto_increment=mi_uint8korr(ptr);	ptr +=8;

  state->checksum=(ha_checksum) mi_uint8korr(ptr);	ptr +=8;

  state->state.checksum=(ha_checksum) mi_uint8korr(ptr);	ptr +=8;

  state->process= mi_uint4korr(ptr);		ptr +=4;

  state->unique = mi_uint4korr(ptr);		ptr +=4;

  state->status = mi_uint4korr(ptr);		ptr +=4;

myisam/mi_update.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ int mi_update(register MI_INFO *info, const byte *oldrec, byte *newrec) 
  if (auto_key_changed)

    update_auto_increment(info,newrec);

  if (share->calc_checksum)

    share->state.checksum+=(info->checksum - old_checksum);

    info->state->checksum+=(info->checksum - old_checksum);



  info->update= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED | HA_STATE_AKTIV |

		 key_changed);