mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

log0log.c:

Browse source 
Backport bugfix from 4.0: combined log file size >= 2 GB could cause log to be written in wrong place
btr0pcur.c:
  Backport bugfix from 4.0: index cursor restoration could theoretically fail


innobase/btr/btr0pcur.c:
  Backport bugfix from 4.0: index cursor restoration could theoretically fail
innobase/log/log0log.c:
  Backport bugfix from 4.0: combined log file size >= 2 GB could cause log to be written in wrong place
This commit is contained in:
unknown 2003-01-05 22:15:03 +02:00
parent 9efb607e11
commit 787307d556
2 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
innobase/btr/btr0pcur.c
View file

@ -292,6 +292,12 @@ btr_pcur_restore_position(
mem_heap_free(heap);
/* We have to store position information, modify clock value, etc.
because the cursor may now be on a different page */
btr_pcur_store_position(cursor, mtr);
return(FALSE);
}

32
innobase/log/log0log.c
View file

@ -437,25 +437,29 @@ log_group_calc_lsn_offset(
dulint lsn, /* in: lsn, must be within 4 GB of group->lsn */
log_group_t* group) /* in: log group */
{
dulint gr_lsn;
ulint gr_lsn_size_offset;
ulint difference;
ulint group_size;
ulint offset;
dulint gr_lsn;
ib_longlong gr_lsn_size_offset;
ib_longlong difference;
ib_longlong group_size;
ib_longlong offset;
ut_ad(mutex_own(&(log_sys->mutex)));
/* If total log file size is > 2 GB we can easily get overflows
with 32-bit integers. Use 64-bit integers instead. */
gr_lsn = group->lsn;
gr_lsn_size_offset = log_group_calc_size_offset(group->lsn_offset,
group);
group_size = log_group_get_capacity(group);
gr_lsn_size_offset = (ib_longlong)
log_group_calc_size_offset(group->lsn_offset, group);
group_size = (ib_longlong) log_group_get_capacity(group);
if (ut_dulint_cmp(lsn, gr_lsn) >= 0) {
difference = ut_dulint_minus(lsn, gr_lsn);
difference = (ib_longlong) ut_dulint_minus(lsn, gr_lsn);
} else {
difference = ut_dulint_minus(gr_lsn, lsn);
difference = (ib_longlong) ut_dulint_minus(gr_lsn, lsn);
difference = difference % group_size;
@ -464,7 +468,13 @@ log_group_calc_lsn_offset(
offset = (gr_lsn_size_offset + difference) % group_size;
return(log_group_calc_real_offset(offset, group));
ut_a(offset <= 0xFFFFFFFF);
/* printf("Offset is %lu gr_lsn_offset is %lu difference is %lu\n",
(ulint)offset,(ulint)gr_lsn_size_offset, (ulint)difference);
*/
return(log_group_calc_real_offset((ulint)offset, group));
}
/***********************************************************************