summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-11-08 09:50:56 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-11-08 10:19:55 +0200
commitc761b43451d54eeeecdf3c102906fcce88d4e9d9 (patch)
treec00b07bf4b36108f1ecbfc3015b5594899e0e248 /sql/sql_prepare.cc
parent07e4853c232726a639b30d4718bef9914ea42d24 (diff)
parentbac2ec3a5b28ed590826b20a4cf27fd788903bbd (diff)
downloadmariadb-git-c761b43451d54eeeecdf3c102906fcce88d4e9d9.tar.gz
Merge 10.3 into 10.4mariadb-10.4.0
Diffstat (limited to 'sql/sql_prepare.cc')
-rw-r--r--sql/sql_prepare.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 09d31470a00..6def798b1c7 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -3043,7 +3043,7 @@ void reinit_stmt_before_use(THD *thd, LEX *lex)
lex->result->cleanup();
lex->result->set_thd(thd);
}
- lex->allow_sum_func= 0;
+ lex->allow_sum_func.clear_all();
lex->in_sum_func= NULL;
DBUG_VOID_RETURN;
}