summaryrefslogtreecommitdiff
path: root/sql/opt_subselect.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-04-20 13:16:03 +0200
committerSergei Golubchik <serg@mariadb.org>2018-04-20 14:33:24 +0200
commit587568b72a0f4bcb284b292f158dea6f65c03487 (patch)
treee9caae1f20e997ce2bc528fc41d1adbe2c2d8bf0 /sql/opt_subselect.cc
parentbcb36ee21e2515d17dcf03b760487e64eb780f2b (diff)
parent51c415d97d60cad732d05c9d5516f7fa3fde1df9 (diff)
downloadmariadb-git-587568b72a0f4bcb284b292f158dea6f65c03487.tar.gz
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/opt_subselect.cc')
-rw-r--r--sql/opt_subselect.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index a27218236bd..a9e21e67f13 100644
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -5960,5 +5960,6 @@ bool JOIN::choose_tableless_subquery_plan()
tmp_having= having;
}
}
+ exec_const_cond= conds;
return FALSE;
}