Merge 5.5, step 3

storage/innobase/ibuf/ibuf0ibuf.c

@@ -325,7 +325,7 @@ dropped! So, there seems to be no problem. */
 /******************************************************************//**
 Sets the flag in the current mini-transaction record indicating we're
 inside an insert buffer routine. */
-UNIV_INTERN
+UNIV_INLINE
 void
 ibuf_enter(
 /*=======*/

storage/innobase/include/buf0rea.h

@@ -28,7 +28,6 @@ Created 11/5/1995 Heikki Tuuri
 
 #include "univ.i"
 #include "buf0types.h"
-#include "mtr0types.h"
 
 /********************************************************************//**
 High-level function which reads a page asynchronously from a file to the

storage/innobase/include/ibuf0ibuf.h

@@ -234,7 +234,7 @@ ibuf_should_try(
 						a secondary index when we
 						decide */
 /******************************************************************//**
-Returns TRUE if the current MTR is performing an insert buffer
+Returns TRUE if the current OS thread is performing an insert buffer
 routine.
 
 For instance, a read-ahead of non-ibuf pages is forbidden by threads

storage/innobase/mtr/mtr0mtr.c

@@ -268,7 +268,6 @@ mtr_commit(
 	ut_d(mtr->state = MTR_COMMITTED);
 	dyn_array_free(&(mtr->memo));
 	dyn_array_free(&(mtr->log));
-        mtr->ibuf_inside = FALSE;
 }
 
 #ifndef UNIV_HOTBACKUP