mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-23 16:55:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix for LOAD DATA FROM MASTER when using tables with checksum

Browse source 
Fixed some wrong test cases


Docs/manual.texi:
  Changelog
extra/perror.c:
  Added BDB table errors
include/myisam.h:
  Fix for LOAD DATA FROM MASTER when using tables with checksum
myisam/mi_check.c:
  Fix for LOAD DATA FROM MASTER when using tables with checksum
mysql-test/mysql-test-run.sh:
  Better logging
mysql-test/r/join.result:
  Fixed missing results
mysql-test/r/rpl000006.result:
  Updated result
mysql-test/t/join.test:
  Fixed wrong test
mysql-test/t/rpl000001.test:
  Fixed wrong test
mysql-test/t/rpl000006.test:
  Cleanup
mysql-test/t/rpl000017-slave.sh:
  Fixed too long password
mysql-test/t/rpl000017.test:
  Fixed too long password
sql/ha_myisam.cc:
  Fix for LOAD DATA FROM MASTER when using tables with checksum
sql/handler.cc:
  Unique error for DEADLOCK
sql/slave.cc:
  Fix for LOAD DATA FROM MASTER when using tables with checksum
This commit is contained in:
unknown 2001-09-18 04:58:15 +03:00
commit c91a3df5c3
15 changed files with 111 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

33
myisam/mi_check.c
View file

@ -1191,8 +1191,12 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,
del=info->state->del;
info->state->records=info->state->del=share->state.split=0;
info->state->empty=0;
param->glob_crc=0;
if (param->testflag & T_CALC_CHECKSUM)
param->calc_checksum=1;
if (!rep_quick)
share->state.checksum=0;
info->update= (short) (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
for (i=0 ; i < info->s->base.keys ; i++)
share->state.key_root[i]= HA_OFFSET_ERROR;
@ -1284,7 +1288,14 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,
share->state.version=(ulong) time((time_t*) 0); /* Force reopen */
}
else
{
info->state->data_file_length=sort_info->max_pos;
if (param->testflag & T_CALC_CHECKSUM)
{
DBUG_PRINT("QQ",("set_checksum"));
share->state.checksum=param->glob_crc;
}
}
if (!(param->testflag & T_SILENT))
{
@ -1867,6 +1878,9 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info,
sort_param.sort_info=sort_info;
del=info->state->del;
param->glob_crc=0;
if (param->testflag & T_CALC_CHECKSUM)
param->calc_checksum=1;
if (! rep_quick)
share->state.checksum=0;
@ -1912,6 +1926,7 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info,
param->retry_repair=1;
goto err;
}
param->calc_checksum=0; /* No need to calc glob_crc */
/* Set for next loop */
sort_param.max_records=sort_info->max_records=
@ -1987,6 +2002,9 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info,
"Can't change size of datafile, error: %d",
my_errno);
}
else if (param->testflag & T_CALC_CHECKSUM)
share->state.checksum=param->glob_crc;
if (my_chsize(share->kfile,info->state->key_file_length,MYF(0)))
mi_check_print_warning(param,
"Can't change size of indexfile, error: %d",
@ -2116,7 +2134,14 @@ static int sort_get_next_record(SORT_INFO *sort_info)
sort_info->max_pos=(sort_info->pos+=share->base.pack_reclength);
share->state.split++;
if (*sort_info->record)
{
if (param->calc_checksum)
{
DBUG_PRINT("QQ",("calc_checksum"));
param->glob_crc+= mi_static_checksum(info,sort_info->record);
}
DBUG_RETURN(0);
}
if (!sort_info->fix_datafile)
{
info->state->del++;
@ -2348,10 +2373,10 @@ static int sort_get_next_record(SORT_INFO *sort_info)
{
if (param->read_cache.error < 0)
DBUG_RETURN(1);
if (info->s->calc_checksum)
info->checksum=mi_checksum(info,sort_info->record);
if ((param->testflag & (T_EXTEND | T_REP)) || searching)
{
if (info->s->calc_checksum)
info->checksum=mi_checksum(info,sort_info->record);
if (_mi_rec_check(info, sort_info->record))
{
mi_check_print_info(param,"Found wrong packed record at %s",
@ -2359,6 +2384,8 @@ static int sort_get_next_record(SORT_INFO *sort_info)
goto try_next;
}
}
if (param->calc_checksum)
param->glob_crc+= info->checksum;
DBUG_RETURN(0);
}
if (!searching)
@ -2421,6 +2448,8 @@ static int sort_get_next_record(SORT_INFO *sort_info)
block_info.rec_len);
share->state.split++;
info->packed_length=block_info.rec_len;
if (param->calc_checksum)
param->glob_crc+= info->checksum;
DBUG_RETURN(0);
}
}