summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorJan Wedvik <jan.wedvik@sun.com>2011-01-11 12:33:28 +0100
committerJan Wedvik <jan.wedvik@sun.com>2011-01-11 12:33:28 +0100
commitb7e3f4501122fb13e7d1d7ddfcb9813a689ac24e (patch)
treece07242750bd65183be380445cdfacb82089a0c1 /sql/handler.cc
parentebd24626ca38e7fa1e3da2acdcf88540be70fabe (diff)
parentf4adb7c6e4cd855499d92c9352dd4d75aab5e1b0 (diff)
downloadmariadb-git-b7e3f4501122fb13e7d1d7ddfcb9813a689ac24e.tar.gz
Merge of fix for bug#58553, "Queries with pushed conditions causes 'explain
extended' to crash mysqld" (see http://lists.mysql.com/commits/128409).
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 4e8af034fd8..783e4d9ae20 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -4759,6 +4759,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());
}