diff options
| author | unknown <evgen@moonbone.local> | 2005-09-22 01:48:39 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2005-09-22 01:48:39 +0400 |
| commit | 14deb9632b7416415e67591778fa0bbe3bcb7750 (patch) | |
| tree | 82542834429510dae504ec72fb07971b184966a8 /sql | |
| parent | a808e97d8aa9d80ae6f310171eba34a45116518a (diff) | |
| parent | 1b02a815dde1379635fb1c76065fc056c084705a (diff) | |
| download | mariadb-git-14deb9632b7416415e67591778fa0bbe3bcb7750.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13180-bug-4.1-mysql
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_lex.cc | 1 | ||||
| -rw-r--r-- | sql/sql_prepare.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 8636b6542fc..07017451bad 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -160,6 +160,7 @@ void lex_start(THD *thd, uchar *buf,uint length) lex->duplicates= DUP_ERROR; lex->ignore= 0; lex->proc_list.first= 0; + thd->allow_sum_func= 0; } void lex_end(LEX *lex) diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 8a50d0bd50e..c8f417c9b9b 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1738,6 +1738,7 @@ static void reset_stmt_for_execute(Prepared_statement *stmt) lex->current_select= &lex->select_lex; if (lex->result) lex->result->cleanup(); + thd->allow_sum_func= 0; } |