diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-08 09:50:56 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-08 10:19:55 +0200 |
| commit | c761b43451d54eeeecdf3c102906fcce88d4e9d9 (patch) | |
| tree | c00b07bf4b36108f1ecbfc3015b5594899e0e248 /sql/sql_delete.cc | |
| parent | 07e4853c232726a639b30d4718bef9914ea42d24 (diff) | |
| parent | bac2ec3a5b28ed590826b20a4cf27fd788903bbd (diff) | |
| download | mariadb-git-c761b43451d54eeeecdf3c102906fcce88d4e9d9.tar.gz | |
Merge 10.3 into 10.4mariadb-10.4.0
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 3ae113a4595..148c2371a6b 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -936,7 +936,7 @@ int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, List<Item> all_fields; *delete_while_scanning= true; - thd->lex->allow_sum_func= 0; + thd->lex->allow_sum_func.clear_all(); if (setup_tables_and_check_access(thd, &thd->lex->first_select_lex()->context, &thd->lex->first_select_lex()-> |