summaryrefslogtreecommitdiff
path: root/sql/sql_select.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
commit0a7cfad0804ab912d185c9478872b990783932bd (patch)
tree33efe1cbbdfd4e1197cf92445003f6cdfd580e51 /sql/sql_select.cc
parent2f4741667867accad41d6b2d2a9ac67851ad35c0 (diff)
downloadmariadb-git-0a7cfad0804ab912d185c9478872b990783932bd.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/sql_select.cc')
-rw-r--r--sql/sql_select.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 9e0a82aa342..067f3cfc95d 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -6380,7 +6380,6 @@ make_join_select(JOIN *join,SQL_SELECT *select,COND *cond)
tab->select_cond=sel->cond=tmp;
/* Push condition to storage engine if this is enabled
and the condition is not guarded */
- tab->table->file->pushed_cond= NULL;
if (thd->variables.engine_condition_pushdown)
{
COND *push_cond=