diff options
author | evgen@moonbone.local <> | 2005-09-22 02:38:14 +0400 |
---|---|---|
committer | evgen@moonbone.local <> | 2005-09-22 02:38:14 +0400 |
commit | 2ba1eb1486b96cdaed1d9b5685f39ead5bdaddee (patch) | |
tree | 71b068067c4b4596c15b8b53424e74567733d64f /sql/sql_lex.cc | |
parent | a5a4c412f10f3d64d0d3605e1092ac446e779b95 (diff) | |
parent | b7e8c8b1126e50442f6de02d257d7ab6c020930c (diff) | |
download | mariadb-git-2ba1eb1486b96cdaed1d9b5685f39ead5bdaddee.tar.gz |
Manual merge
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r-- | sql/sql_lex.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index b7a2b6b0624..32178a0a07d 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -171,6 +171,7 @@ void lex_start(THD *thd, uchar *buf,uint length) lex->sql_command= lex->orig_sql_command= SQLCOM_END; lex->duplicates= DUP_ERROR; lex->ignore= 0; + thd->allow_sum_func= 0; lex->sphead= NULL; lex->spcont= NULL; lex->proc_list.first= 0; |