summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-07-04 15:31:25 +0400
committerAlexander Barkov <bar@mariadb.org>2017-07-04 15:31:25 +0400
commit5c0df0e4a89b12813cef665533e852a50ecaafae (patch)
treeb75df302abedca56d679ef04a019fac3a5fc7dbc /sql/table.cc
parent25ad623d64ebc34093544875e5b0ebd6101e975b (diff)
parentad2d722acd7bd7a816dff7838f3fa2dcaaeec8da (diff)
downloadmariadb-git-5c0df0e4a89b12813cef665533e852a50ecaafae.tar.gz
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/table.cc b/sql/table.cc
index dcfb3edff33..4a1214cbb70 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -8249,8 +8249,12 @@ Item* TABLE_LIST::build_pushable_cond_for_table(THD *thd, Item *cond)
Item *left_item_clone= left_item->build_clone(thd, thd->mem_root);
Item *right_item_clone= item->build_clone(thd, thd->mem_root);
if (left_item_clone && right_item_clone)
+ {
+ left_item_clone->set_item_equal(NULL);
+ right_item_clone->set_item_equal(NULL);
eq= new (thd->mem_root) Item_func_eq(thd, right_item_clone,
left_item_clone);
+ }
if (eq)
{
i++;