summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorJan Wedvik <jan.wedvik@sun.com>2011-01-11 12:09:54 +0100
committerJan Wedvik <jan.wedvik@sun.com>2011-01-11 12:09:54 +0100
commitf4adb7c6e4cd855499d92c9352dd4d75aab5e1b0 (patch)
tree33efe1cbbdfd4e1197cf92445003f6cdfd580e51 /sql/handler.cc
parent99e95e8dabdaf5cb87529209b0602a76db9c8324 (diff)
downloadmariadb-git-f4adb7c6e4cd855499d92c9352dd4d75aab5e1b0.tar.gz
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.
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 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());
}