Commit c2323bae authored by unknown's avatar unknown
Browse files

trx0trx.h, trx0trx.ic, row0mysql.c: 

  Fix another bug in the fix of Bug #3300


innobase/row/row0mysql.c:
  Fix another bug in the fix of Bug #3300
innobase/include/trx0trx.ic:
  Fix another bug in the fix of Bug #3300
innobase/include/trx0trx.h:
  Fix another bug in the fix of Bug #3300
parent 5bcbe404

innobase/include/trx0trx.h

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ trx_reset_new_rec_lock_info( 
/*========================*/

	trx_t*	trx);	/* in: transaction struct */

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

Registers that we have set a new record lock on an index. We only have

space to store 2 indexes! If this is called more than twice after

Registers that we have set a new record lock on an index. We only have space

to store 2 indexes! If this is called to store more than 2 indexes after

trx_reset_new_rec_lock_info(), then this function does nothing. */

UNIV_INLINE

void

innobase/include/trx0trx.ic

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ trx_reset_new_rec_lock_info( 
}



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

Registers that we have set a new record lock on an index. We only have

space to store 2 indexes! If this is called more than twice after

Registers that we have set a new record lock on an index. We only have space

to store 2 indexes! If this is called to store more than 2 indexes after

trx_reset_new_rec_lock_info(), then this function does nothing. */

UNIV_INLINE

void

innobase/row/row0mysql.c

+1 −1
Original line number Diff line number Diff line
@@ -1517,7 +1517,7 @@ row_unlock_for_mysql( 
									&mtr);

		}



		rec = btr_pcur_get_rec(pcur);

		rec = btr_pcur_get_rec(clust_pcur);



		mutex_enter(&kernel_mutex);