diff options
| author | igor@rurik.mysql.com <> | 2005-11-13 17:56:20 -0800 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2005-11-13 17:56:20 -0800 |
| commit | d903d10f80ba40943082c62e91a5f25509ae077d (patch) | |
| tree | 284461e48d23194798480c65afd64354a9cec3f1 /sql/sql_prepare.cc | |
| parent | 13260ea8f36488e2121e6ba019d7b970c8d4887f (diff) | |
| parent | 8e8a2d79cc6d4db2a64709d60dd5b4dabae36642 (diff) | |
| download | mariadb-git-d903d10f80ba40943082c62e91a5f25509ae077d.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
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 ced862170ec..a5cf678aa3a 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; } |