diff options
| author | unknown <brian@zim.(none)> | 2006-03-09 10:39:40 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-03-09 10:39:40 -0800 |
| commit | 4f3a18d5b5dbe4db464cc489f739c9b84c02fbf0 (patch) | |
| tree | 47df89ae26421d49c6b6ce4cb0f8f52e9aa793f9 /sql/item_cmpfunc.cc | |
| parent | fe0b818f9a07a9e56053c8addf53796e106e6c81 (diff) | |
| parent | 85d705b651cf9057f2d687294044f173880675c3 (diff) | |
| download | mariadb-git-4f3a18d5b5dbe4db464cc489f739c9b84c02fbf0.tar.gz | |
Merge zim.(none):/home/brian/mysql/mysql-5.0
into zim.(none):/home/brian/mysql/mysql-5.1-new
configure.in:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 6b8a5c2fdf4..6c19c96f77c 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -2547,7 +2547,8 @@ Item_cond::fix_fields(THD *thd, Item **ref) { table_map tmp_table_map; while (item->type() == Item::COND_ITEM && - ((Item_cond*) item)->functype() == functype()) + ((Item_cond*) item)->functype() == functype() && + !((Item_cond*) item)->list.is_empty()) { // Identical function li.replace(((Item_cond*) item)->list); ((Item_cond*) item)->list.empty(); |