diff options
| author | unknown <igor@rurik.mysql.com> | 2005-10-27 21:37:52 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-10-27 21:37:52 -0700 |
| commit | cc57d4ef4e49f78f487a6497949871c0a5e3b158 (patch) | |
| tree | 77b9cfe2f48b6462eb7de864b5248d396ab8bba6 /sql/sql_update.cc | |
| parent | a397d1f7149dcdeac86e9e4870780dcd8e99a908 (diff) | |
| parent | cd49e32407dcc88a86a26b4c8720afd9ef99b7dd (diff) | |
| download | mariadb-git-cc57d4ef4e49f78f487a6497949871c0a5e3b158.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_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
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_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 620b9676dde..8588b1921ea 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -587,7 +587,7 @@ bool mysql_prepare_update(THD *thd, TABLE_LIST *table_list, bzero((char*) &tables,sizeof(tables)); // For ORDER BY tables.table= table; tables.alias= table_list->alias; - thd->allow_sum_func= 0; + thd->lex->allow_sum_func= 0; if (setup_tables(thd, &select_lex->context, &select_lex->top_join_list, table_list, conds, &select_lex->leaf_tables, |