diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-28 11:34:53 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-28 11:34:53 +0200 |
| commit | 69bfcd9c400e0b00fe53aaee8da0b38b0bf5f9ad (patch) | |
| tree | 5b0761b29daf8c864538d0fb55e20e9b54758e47 /sql/sql_update.cc | |
| parent | 59041a2b356943bda95d38c10e9ba01f7b2c7a73 (diff) | |
| parent | e4fe90bfa767366a4784adb4e7c65bca7c5c0537 (diff) | |
| download | mariadb-git-69bfcd9c400e0b00fe53aaee8da0b38b0bf5f9ad.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysys/my_init.c:
Auto merged
sql/sql_update.cc:
Auto merged
Makefile.am:
Manual merge
mysql-test/r/cast.result:
Manual merge
mysql-test/t/cast.test:
Manual merge
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
Manual merge
sql/ha_ndbcluster.cc:
Manual merge
sql/item.h:
Manual merge
sql/opt_sum.cc:
Manual merge
sql/sql_delete.cc:
Manual merge
sql/sql_lex.cc:
Manual merge
sql/sql_load.cc:
Manual merge
sql/sql_prepare.cc:
Manual merge
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index efdf1291305..f85ef355752 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -571,6 +571,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; if (setup_tables(thd, &select_lex->context, &select_lex->top_join_list, table_list, conds, &select_lex->leaf_tables, |