diff options
| author | igor@rurik.mysql.com <> | 2005-11-04 17:54:47 -0800 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2005-11-04 17:54:47 -0800 |
| commit | 8e8a2d79cc6d4db2a64709d60dd5b4dabae36642 (patch) | |
| tree | ce0dd0af8ccca66eb82e7a97cf01efcdf905fbaf /sql/sql_update.cc | |
| parent | 75f09a9819e06cb74ab15edcd9fe8b7960b1027a (diff) | |
| parent | 6a1c8d48f63bd12fb55e8367c925e71d5e897a47 (diff) | |
| download | mariadb-git-8e8a2d79cc6d4db2a64709d60dd5b4dabae36642.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
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 039aa0f71fa..06332e453ed 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -596,7 +596,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, |