diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-01-21 14:03:30 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-01-21 14:03:30 +0200 |
| commit | 93311f2baf3e5df084f1853a3a2b16dcad27af48 (patch) | |
| tree | 77c7b157cd467c1df71917aef28d9ec8756f1eae /sql/item.cc | |
| parent | 2a45a13c216fa23522454eba040fef13022a37a9 (diff) | |
| parent | 8a3d3a539fa3aa2967c76c3eb59033a13524aeed (diff) | |
| download | mariadb-git-93311f2baf3e5df084f1853a3a2b16dcad27af48.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index 7a2f8e26567..53f63a977e0 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -608,7 +608,7 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) (char *)field_name); if (!r) return 1; - if (r->check_cols(1) || r->fix_fields(thd, tables, ref)) + if (r->fix_fields(thd, tables, ref) || r->check_cols(1)) return 1; r->depended_from= last; cursel->mark_as_dependent(last); @@ -632,7 +632,7 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) if (!rf) return 1; (rf)->outer_resolving= outer_resolving; - return rf->check_cols(1) || rf->fix_fields(thd, tables, ref); + return rf->fix_fields(thd, tables, ref) || rf->check_cols(1); } } } |