diff options
| author | unknown <brian@zim.(none)> | 2005-02-10 19:04:38 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-02-10 19:04:38 -0800 |
| commit | f59911fc1ce9abd93775a64e7e8988cfcbd0677f (patch) | |
| tree | 3e0bea0c927d0815cfeb1ef09b857ebb42f236c4 /sql/item.cc | |
| parent | a20374e33f10c1eb4e404844c5ef162ce37d2fcf (diff) | |
| download | mariadb-git-f59911fc1ce9abd93775a64e7e8988cfcbd0677f.tar.gz | |
Set of fixes requested by Kent in IRC. Tested (except the windows changes since I am trusting Kent...). No windows compiles here folks...
VC++Files/tests/mysql_client_test.dsp:
fix request by Kent
sql/item.cc:
fix requested by kent
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 17d41fda677..4b3acbe5a3c 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -2797,7 +2797,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. |