summaryrefslogtreecommitdiff
path: root/sql/sql_derived.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2018-06-05 10:50:08 +0400
committerAlexander Barkov <bar@mariadb.com>2018-06-05 10:50:08 +0400
commitab297744b7318645159cd5f9ec26378473cecf52 (patch)
tree28df98886259f9df535b84deff18a89e08064e58 /sql/sql_derived.cc
parent8760acdda88cc5ead925024bc47df4d27f911bb0 (diff)
parent106f0b5798a2b5d13b7d67c3cc678fc0cc2184c2 (diff)
downloadmariadb-git-ab297744b7318645159cd5f9ec26378473cecf52.tar.gz
Merge remote-tracking branch 'origin/10.3' into 10.4
Diffstat (limited to 'sql/sql_derived.cc')
-rw-r--r--sql/sql_derived.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index 944fc837572..39630293c20 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -465,9 +465,7 @@ bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived)
derived->prep_on_expr= expr->copy_andor_structure(thd);
}
if (derived->on_expr &&
- ((!derived->on_expr->fixed &&
- derived->on_expr->fix_fields(thd, &derived->on_expr)) ||
- derived->on_expr->check_cols(1)))
+ derived->on_expr->fix_fields_if_needed_for_bool(thd, &derived->on_expr))
{
res= TRUE; /* purecov: inspected */
goto exit_merge;