diff options
| author | unknown <igor@rurik.mysql.com> | 2005-11-04 17:54:47 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-11-04 17:54:47 -0800 |
| commit | b5182e4b92bf9d4043b4ab65dedb46c14f54f6ba (patch) | |
| tree | ce0dd0af8ccca66eb82e7a97cf01efcdf905fbaf /sql/sql_prepare.cc | |
| parent | 61b86c599168338632c17c243fcd65ae5f91f022 (diff) | |
| parent | bef391c878582d10a91720aaf2244082d13db867 (diff) | |
| download | mariadb-git-b5182e4b92bf9d4043b4ab65dedb46c14f54f6ba.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
mysql-test/r/func_gconcat.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 0d0afb5ca7d..78f1ceac828 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2129,7 +2129,8 @@ void reinit_stmt_before_use(THD *thd, LEX *lex) lex->result->cleanup(); lex->result->set_thd(thd); } - thd->allow_sum_func= 0; + lex->allow_sum_func= 0; + lex->in_sum_func= NULL; DBUG_VOID_RETURN; } |