Commit 42095544 authored by heikki@hundin.mysql.fi's avatar heikki@hundin.mysql.fi
Browse files

log0log.c: 

  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
parent a41886a0

innobase/btr/btr0pcur.c

+6 −0
Original line number Diff line number Diff line
@@ -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);

}

innobase/log/log0log.c

+21 −11
Original line number Diff line number Diff line
@@ -438,24 +438,28 @@ log_group_calc_lsn_offset( 
	log_group_t*	group)	/* in: log group */

{

        dulint	        gr_lsn;

	ulint	gr_lsn_size_offset;

	ulint	difference;

	ulint	group_size;

	ulint	offset;

       	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));

}



/***********************************************************************