diff options
| author | unknown <igor@rurik.mysql.com> | 2006-04-05 14:00:54 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-04-05 14:00:54 -0700 |
| commit | ef4309284d0124e4b5cb76a379da1571cd8ce464 (patch) | |
| tree | 5478f3804bd93ddefb8eb77c1029c4f84fe48570 /sql/opt_sum.cc | |
| parent | fb559d433f33dc457de061bb666c6f13cc4a4336 (diff) | |
| parent | e77888f53075d283d1e8d2c719ef91896b93e15e (diff) | |
| download | mariadb-git-ef4309284d0124e4b5cb76a379da1571cd8ce464.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/opt_sum.cc:
Auto merged
Diffstat (limited to 'sql/opt_sum.cc')
| -rw-r--r-- | sql/opt_sum.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index 4158031b9a9..aac47707d1b 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -96,8 +96,14 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) */ for (TABLE_LIST *tl= tables; tl; tl= tl->next_leaf) { + TABLE_LIST *embedded; + for (embedded= tl ; embedded; embedded= embedded->embedding) + { + if (embedded->on_expr) + break; + } + if (embedded) /* Don't replace expression on a table that is part of an outer join */ - if (tl->on_expr) { outer_tables|= tl->table->map; |