diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-03-09 12:52:25 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-03-09 12:52:25 +0200 |
| commit | b790f31fcef613f27597bf5a2f866c78376b074d (patch) | |
| tree | d3c1e37bae62a884fc201f284f48cd2d27f05630 /sql/item_cmpfunc.cc | |
| parent | 23f9f229d422db7ee55ecb42c93e69da45dd9e51 (diff) | |
| parent | ae7eec928c86014f7eef3e48fa28196cf999434c (diff) | |
| download | mariadb-git-b790f31fcef613f27597bf5a2f866c78376b074d.tar.gz | |
merge
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index f0bc73e9501..b56ad6febd4 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1775,8 +1775,11 @@ Item_cond::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) } if (abort_on_null) item->top_level_item(); + + // item can be substituted in fix_fields if ((!item->fixed && - item->fix_fields(thd, tables, li.ref())) || item->check_cols(1)) + item->fix_fields(thd, tables, li.ref())) || + (item= *li.ref())->check_cols(1)) return 1; /* purecov: inspected */ used_tables_cache|= item->used_tables(); tmp_table_map= item->not_null_tables(); |