diff options
| author | jimw@mysql.com <> | 2005-12-12 11:57:07 -0800 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-12-12 11:57:07 -0800 |
| commit | 00d29cd259dd172b92a87363f97d84c4667101df (patch) | |
| tree | a1d498bb5425a813ab13ceed035fe9dd108a616e /sql/sql_update.cc | |
| parent | 3a9c099ba3b6ab561832a6c7b4001203789913b6 (diff) | |
| parent | 90befc0a0e1b29863ba04a7924edb954bb9a71e9 (diff) | |
| download | mariadb-git-00d29cd259dd172b92a87363f97d84c4667101df.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into mysql.com:/home/jimw/my/mysql-5.1-clean
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 359475827b1..3aa6e7fc874 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -632,6 +632,7 @@ int mysql_update(THD *thd, if (!transactional_table) thd->options|=OPTION_STATUS_NO_TRANS_UPDATE; } + free_underlaid_joins(thd, select_lex); if (transactional_table) { if (ha_autocommit_or_rollback(thd, error >= 0)) @@ -644,7 +645,6 @@ int mysql_update(THD *thd, thd->lock=0; } - free_underlaid_joins(thd, select_lex); if (error < 0) { char buff[STRING_BUFFER_USUAL_SIZE]; @@ -706,7 +706,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, |