diff options
| author | unknown <igor@rurik.mysql.com> | 2005-10-29 09:41:18 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-10-29 09:41:18 -0700 |
| commit | bef391c878582d10a91720aaf2244082d13db867 (patch) | |
| tree | 5df4e5828747a3ee61552d770e432cca6d97ba68 /sql/sql_delete.cc | |
| parent | 4693b58da07c4ba00b9e84661177764e529850da (diff) | |
| parent | cc57d4ef4e49f78f487a6497949871c0a5e3b158 (diff) | |
| download | mariadb-git-bef391c878582d10a91720aaf2244082d13db867.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.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
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_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 24b11916bf1..571ef141851 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -333,7 +333,7 @@ bool mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds) SELECT_LEX *select_lex= &thd->lex->select_lex; DBUG_ENTER("mysql_prepare_delete"); - thd->allow_sum_func= 0; + thd->lex->allow_sum_func= 0; if (setup_tables(thd, &thd->lex->select_lex.context, &thd->lex->select_lex.top_join_list, table_list, conds, &select_lex->leaf_tables, |