From f4adb7c6e4cd855499d92c9352dd4d75aab5e1b0 Mon Sep 17 00:00:00 2001
From: Jan Wedvik <jan.wedvik@sun.com>
Date: Tue, 11 Jan 2011 12:09:54 +0100
Subject: Fix for bug#58553, "Queries with pushed conditions causes 'explain
 extended' to crash mysqld".

handler::pushed_cond was not always properly reset when table objects where
recycled via the table cache.

handler::pushed_cond is now set to NULL in handler::ha_reset(). This should
prevent pushed conditions from (incorrectly) re-apperaring in later queries.
---
 sql/handler.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sql/handler.cc')

diff --git a/sql/handler.cc b/sql/handler.cc
index ce4e4a9e3a9..711d2942ce0 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -4657,6 +4657,7 @@ int handler::ha_reset()
   free_io_cache(table);
   /* reset the bitmaps to point to defaults */
   table->default_column_bitmaps();
+  pushed_cond= NULL;
   DBUG_RETURN(reset());
 }
 
-- 
cgit v1.2.1