diff options
| author | unknown <ingo@mysql.com> | 2005-02-11 11:59:35 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-02-11 11:59:35 +0100 |
| commit | 72750ad95ac45e12bedce010cf44e14e2c4f63ea (patch) | |
| tree | d73fcf1368fb2dea3f7313a842fda03a076166ab /sql/item.cc | |
| parent | 6520c161cf4d8f80a7701841e8e94ee53b95f6ed (diff) | |
| parent | 53596fa16f4387fa6b0101ab18fb9af24d3163b7 (diff) | |
| download | mariadb-git-72750ad95ac45e12bedce010cf44e14e2c4f63ea.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
include/my_pthread.h:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/table.cc:
SCCS merged
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 96806ea2ed1..53d9d532b3d 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -4525,7 +4525,7 @@ bool Item_type_holder::join_types(THD *thd, Item *item, TABLE *table) bool use_new_field= 0, use_expression_type= 0; Item_result new_result_type= type_convertor[item_type][item->result_type()]; Field *field= get_holder_example_field(thd, item, table); - bool item_is_a_field= field; + bool item_is_a_field= (field != NULL); /* Check if both items point to fields: in this case we can adjust column types of result table in the union smartly. |