Merge lp:~brianaker/drizzle/mysql-bug-13358468 into lp:~drizzle-trunk/drizzle/development

[Brian Aker]

Fix for mysql bug (we may have this outstanding as a bug on us as well).

=== modified file 'plugin/innobase/btr/btr0pcur.cc'
--- plugin/innobase/btr/btr0pcur.cc	2010-12-24 00:04:05 +0000
+++ plugin/innobase/btr/btr0pcur.cc	2012-01-12 01:29:24 +0000
@@ -247,6 +247,8 @@
 			cursor->rel_pos == BTR_PCUR_BEFORE_FIRST_IN_TREE,
 			index, latch_mode, btr_pcur_get_btr_cur(cursor), mtr);
 
+                cursor->latch_mode = latch_mode;
+                cursor->pos_state = BTR_PCUR_IS_POSITIONED;
 		cursor->block_when_stored = btr_pcur_get_block(cursor);
 
 		return(FALSE);

=== modified file 'plugin/innobase/include/btr0pcur.h'
--- plugin/innobase/include/btr0pcur.h	2011-03-14 05:40:28 +0000
+++ plugin/innobase/include/btr0pcur.h	2012-01-12 01:29:24 +0000
@@ -293,14 +293,6 @@
 /*========================*/
 	btr_pcur_t*	pcur,	/*!< in: persistent cursor */
 	mtr_t*		mtr);	/*!< in: mtr to commit */
-/**************************************************************//**
-Tests if a cursor is detached: that is the latch mode is BTR_NO_LATCHES.
-@return	TRUE if detached */
-UNIV_INLINE
-ibool
-btr_pcur_is_detached(
-/*=================*/
-	btr_pcur_t*	pcur);	/*!< in: persistent cursor */
 /*********************************************************//**
 Moves the persistent cursor to the next record in the tree. If no records are
 left, the cursor stays 'after last in tree'.

=== modified file 'plugin/innobase/include/btr0pcur.ic'
--- plugin/innobase/include/btr0pcur.ic	2010-12-18 04:43:40 +0000
+++ plugin/innobase/include/btr0pcur.ic	2012-01-12 01:29:24 +0000
@@ -417,38 +417,6 @@
 }
 
 /**************************************************************//**
-Sets the pcur latch mode to BTR_NO_LATCHES. */
-UNIV_INLINE
-void
-btr_pcur_detach(
-/*============*/
-	btr_pcur_t*	pcur)	/*!< in: persistent cursor */
-{
-	ut_a(pcur->pos_state == BTR_PCUR_IS_POSITIONED);
-
-	pcur->latch_mode = BTR_NO_LATCHES;
-
-	pcur->pos_state = BTR_PCUR_WAS_POSITIONED;
-}
-
-/**************************************************************//**
-Tests if a cursor is detached: that is the latch mode is BTR_NO_LATCHES.
-@return	TRUE if detached */
-UNIV_INLINE
-ibool
-btr_pcur_is_detached(
-/*=================*/
-	btr_pcur_t*	pcur)	/*!< in: persistent cursor */
-{
-	if (pcur->latch_mode == BTR_NO_LATCHES) {
-
-		return(TRUE);
-	}
-
-	return(FALSE);
-}
-
-/**************************************************************//**
 Sets the old_rec_buf field to NULL. */
 UNIV_INLINE
 void