diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-12-21 14:52:39 +0100 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-12-21 14:52:39 +0100 |
| commit | 4a045182fafe049df88d72420bac6628ff37f160 (patch) | |
| tree | 4db05ce0abde8a41b21fcb0c65c94ab0635b8952 /sql/sql_select.cc | |
| parent | c1177ef1197158ef1c33d06c434c9d2c76f6404e (diff) | |
| parent | af3dd8281a7f810885ac9d10073dd37960df834e (diff) | |
| download | mariadb-git-4a045182fafe049df88d72420bac6628ff37f160.tar.gz | |
Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
into linux-st28.site:/home/martin/mysql/src/bug32848/my51-bug32848
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/union.result:
Bug#32848: Manual merge
mysql-test/t/union.test:
Bug#32848: Manual merge
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 3a142568080..741e8afec1d 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -9277,6 +9277,8 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table, *((*copy_func)++) = item; // Save for copy_funcs if (modify_item) item->set_result_field(new_field); + if (item->type() == Item::NULL_ITEM) + new_field->is_created_from_null_item= TRUE; return new_field; } |