diff options
| author | unknown <igor@rurik.mysql.com> | 2005-10-27 21:37:52 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-10-27 21:37:52 -0700 |
| commit | cc57d4ef4e49f78f487a6497949871c0a5e3b158 (patch) | |
| tree | 77b9cfe2f48b6462eb7de864b5248d396ab8bba6 /sql/sql_prepare.cc | |
| parent | a397d1f7149dcdeac86e9e4870780dcd8e99a908 (diff) | |
| parent | cd49e32407dcc88a86a26b4c8720afd9ef99b7dd (diff) | |
| download | mariadb-git-cc57d4ef4e49f78f487a6497949871c0a5e3b158.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.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
sql/sql_yacc.yy:
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 865c597e00d..d79555d9797 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2127,7 +2127,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; } |