diff options
| author | jimw@mysql.com <> | 2005-12-12 11:57:07 -0800 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-12-12 11:57:07 -0800 |
| commit | 00d29cd259dd172b92a87363f97d84c4667101df (patch) | |
| tree | a1d498bb5425a813ab13ceed035fe9dd108a616e /sql/sql_prepare.cc | |
| parent | 3a9c099ba3b6ab561832a6c7b4001203789913b6 (diff) | |
| parent | 90befc0a0e1b29863ba04a7924edb954bb9a71e9 (diff) | |
| download | mariadb-git-00d29cd259dd172b92a87363f97d84c4667101df.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into mysql.com:/home/jimw/my/mysql-5.1-clean
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 2f08583d974..7b35f057217 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2131,7 +2131,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; } |