summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-03-04 16:46:58 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-03-04 16:46:58 +0200
commit9835f7b80fc0eaa7fe4969ae87ae1bfbcc7aa157 (patch)
tree8c12732d7d80790d1f70ed5e302398600b733186 /sql/sql_union.cc
parent74d648db12e100c628548fb2e5aa67de718bd1fb (diff)
parent91e4f00389483d22fa81517bbcdcd21499fd283a (diff)
downloadmariadb-git-9835f7b80fc0eaa7fe4969ae87ae1bfbcc7aa157.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r--sql/sql_union.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index eb66dce25e3..abee979ff1c 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -417,8 +417,9 @@ st_select_lex_unit::init_prepare_fake_select_lex(THD *thd_arg,
called at the first execution of the statement, while first_execution
shows whether this is called at the first execution of the union that
may form just a subselect.
- */
- if (!fake_select_lex->first_execution && first_execution)
+ */
+ if ((fake_select_lex->changed_elements & TOUCHED_SEL_COND) &&
+ first_execution)
{
for (ORDER *order= global_parameters()->order_list.first;
order;