diff options
| author | unknown <igor@rurik.mysql.com> | 2005-11-13 17:56:20 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-11-13 17:56:20 -0800 |
| commit | 2c748c3ef9980f5be1373fd5998349b9f63a9851 (patch) | |
| tree | 284461e48d23194798480c65afd64354a9cec3f1 /sql/sql_prepare.cc | |
| parent | b10c7d60bd46135760c59291415c49db6e8d8f71 (diff) | |
| parent | b5182e4b92bf9d4043b4ab65dedb46c14f54f6ba (diff) | |
| download | mariadb-git-2c748c3ef9980f5be1373fd5998349b9f63a9851.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_lex.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_yacc.yy:
Auto merged
sql/mysql_priv.h:
Manual merge
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; } |