summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-01-12 17:08:52 +0200
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-01-12 17:08:52 +0200
commit157a2245f25336ca85df44e6a30f29bd5433cc7b (patch)
treeda0982c91ebe6b9ce8a91a26ba09fb425b1341dc /sql/sql_base.cc
parent541e0fa8bf7ffaf7f443cdc2cc69721032aeefcf (diff)
parente073e2c0be3860eafd08b2ab14c8490dcb3b05fc (diff)
downloadmariadb-git-157a2245f25336ca85df44e6a30f29bd5433cc7b.tar.gz
merge
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r--sql/sql_base.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 67815d7d9b4..995520ab16f 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2993,6 +2993,11 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
table->insert_values= 0;
table->fulltext_searched= 0;
table->file->ft_handler= 0;
+ /*
+ Check that there is no reference to a condtion from an earlier query
+ (cf. Bug#58553).
+ */
+ DBUG_ASSERT(table->file->pushed_cond == NULL);
table->reginfo.impossible_range= 0;
/* Catch wrong handling of the auto_increment_field_not_null. */
DBUG_ASSERT(!table->auto_increment_field_not_null);