summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-01-12 17:10:12 +0200
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-01-12 17:10:12 +0200
commitb0bbc008999a6022fccad66122c82ceaa1c030f0 (patch)
treecb76fb473e598f1394bec8d72a6b259ce7c7bb07 /sql/sql_base.cc
parent17cd0bccdbc9be80e02aeed33a0a3c34e24bff5d (diff)
parent75c2a822b8d71e827be8e507c27250a08820000c (diff)
downloadmariadb-git-b0bbc008999a6022fccad66122c82ceaa1c030f0.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 b5684db25eb..882b1a2e8a7 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -3068,6 +3068,11 @@ retry_share:
table->reginfo.lock_type=TL_READ; /* Assume read */
reset:
+ /*
+ Check that there is no reference to a condtion from an earlier query
+ (cf. Bug#58553).
+ */
+ DBUG_ASSERT(table->file->pushed_cond == NULL);
table_list->updatable= 1; // It is not derived table nor non-updatable VIEW
table_list->table= table;