diff options
| author | unknown <igor@rurik.mysql.com> | 2005-10-22 19:35:37 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-10-22 19:35:37 -0700 |
| commit | cd49e32407dcc88a86a26b4c8720afd9ef99b7dd (patch) | |
| tree | ebe3a32ff819aa215d075626945538fd5178dbf5 /sql/sql_update.cc | |
| parent | d29ecd5e91adf6eaeb4f2afef0db30648fe08065 (diff) | |
| parent | 8a84dd7e7f9d699c84d2ed52fe6189f01e6d0ce6 (diff) | |
| download | mariadb-git-cd49e32407dcc88a86a26b4c8720afd9ef99b7dd.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_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.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 a8e21177338..24a080e0675 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -589,7 +589,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, |