From adc1f2f4c939c15ad5efd37633332560456cd4fd Mon Sep 17 00:00:00 2001
From: Igor Babaev <igor@askmonty.org>
Date: Thu, 2 Jun 2011 14:03:02 -0700
Subject: Applied the patch for bug 58837 (for the mysql-5.6 code line). This
 patch fixed the crash in innodb_bug59307.

---
 sql/handler.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sql/handler.h')

diff --git a/sql/handler.h b/sql/handler.h
index 4707aabbd52..96cea68e1fb 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1716,6 +1716,7 @@ public:
     DBUG_ENTER("ha_rnd_init");
     DBUG_ASSERT(inited==NONE || (inited==RND && scan));
     inited= (result= rnd_init(scan)) ? NONE: RND;
+    end_range= NULL;
     DBUG_RETURN(result);
   }
   int ha_rnd_end()
@@ -1723,6 +1724,7 @@ public:
     DBUG_ENTER("ha_rnd_end");
     DBUG_ASSERT(inited==RND);
     inited=NONE;
+    end_range= NULL;
     DBUG_RETURN(rnd_end());
   }
   int ha_rnd_init_with_error(bool scan) __attribute__ ((warn_unused_result));
-- 
cgit v1.2.1