From 54c47527e25f7ebe8c0d995b4a9a1bea901047a9 Mon Sep 17 00:00:00 2001
From: "Krunal Bauskar krunal.bauskar@oracle.com" <Unknown>
Date: Mon, 14 Jan 2013 10:49:51 +0530
Subject: [PATCH] - BUG#1608883:  KILLING A QUERY INSIDE INNODB CAUSES IT TO
 EVENTUALLY CRASH   WITH AN ASSERTION

  Recently we added check to handle kill query signal for long operating
  queries.
  While the query interruption is reported it must to ensure cursor is restore
  to proper state for HANDLER interface to work correctly.
  Normal select query will not face this problem, as on recieving interrupt,
  select query is aborted and new select query result in re-initialization
  (including cursor).

  rb://1836. Approved by Marko.
---
 storage/innobase/row/row0sel.c      | 4 ++++
 storage/innodb_plugin/ChangeLog     | 5 +++++
 storage/innodb_plugin/row/row0sel.c | 6 +++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c
index cf3b36fbac2..2137facf638 100644
--- a/storage/innobase/row/row0sel.c
+++ b/storage/innobase/row/row0sel.c
@@ -33,6 +33,8 @@ Created 12/19/1997 Heikki Tuuri
 #include "read0read.h"
 #include "buf0lru.h"
 #include "ha_prototypes.h"
+#include "m_string.h" /* for my_sys.h */
+#include "my_sys.h" /* DEBUG_SYNC_C */
 
 /* Maximum number of rows to prefetch; MySQL interface has another parameter */
 #define SEL_MAX_N_PREFETCH	16
@@ -3758,7 +3760,9 @@ wait_table_again:
 	}
 
 rec_loop:
+	DEBUG_SYNC_C("row_search_rec_loop");
 	if (trx_is_interrupted(trx)) {
+		btr_pcur_store_position(pcur, &mtr);
 		err = DB_INTERRUPTED;
 		goto normal_return;
 	}
diff --git a/storage/innodb_plugin/ChangeLog b/storage/innodb_plugin/ChangeLog
index e9c86a85d29..6a389f618af 100644
--- a/storage/innodb_plugin/ChangeLog
+++ b/storage/innodb_plugin/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-11	The InnoDB Team
+	* row/row0sel.c:
+	Fix Bug#16088883 KILLING A QUERY INSIDE INNODB CAUSES IT TO
+	EVENTUALLY CRASH WITH AN ASSERTION
+
 2012-12-18	The InnoDB Team
 
 	* include/univ.i:
diff --git a/storage/innodb_plugin/row/row0sel.c b/storage/innodb_plugin/row/row0sel.c
index d825d799a3c..d2e83450860 100644
--- a/storage/innodb_plugin/row/row0sel.c
+++ b/storage/innodb_plugin/row/row0sel.c
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1997, 2011, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1997, 2013, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -57,6 +57,8 @@ Created 12/19/1997 Heikki Tuuri
 #include "read0read.h"
 #include "buf0lru.h"
 #include "ha_prototypes.h"
+#include "m_string.h" /* for my_sys.h */
+#include "my_sys.h" /* DEBUG_SYNC_C */
 
 /* Maximum number of rows to prefetch; MySQL interface has another parameter */
 #define SEL_MAX_N_PREFETCH	16
@@ -3908,7 +3910,9 @@ wait_table_again:
 	}
 
 rec_loop:
+	DEBUG_SYNC_C("row_search_rec_loop");
 	if (trx_is_interrupted(trx)) {
+		btr_pcur_store_position(pcur, &mtr);
 		err = DB_INTERRUPTED;
 		goto normal_return;
 	}