diff options
| author | unknown <mhansson/martin@linux-st28.site> | 2007-12-19 15:59:05 +0100 |
|---|---|---|
| committer | unknown <mhansson/martin@linux-st28.site> | 2007-12-19 15:59:05 +0100 |
| commit | 5480cbd69ec553dbb266533474989ce62774516c (patch) | |
| tree | 3f1a6986c8f700958371ae168aab9940cd26789b /sql/item.cc | |
| parent | 55d284d424c954888536f615731a61d039d80ac1 (diff) | |
| parent | 94f75ffcce4daddfb709bd269fc90d1513833966 (diff) | |
| download | mariadb-git-5480cbd69ec553dbb266533474989ce62774516c.tar.gz | |
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
into linux-st28.site:/home/martin/mysql/src/bug32848/my50-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/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc index 975b517284f..2d49c7b6d60 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -6608,6 +6608,8 @@ enum_field_types Item_type_holder::get_real_type(Item *item) */ Field *field= ((Item_field *) item)->field; enum_field_types type= field->real_type(); + if (field->is_created_from_null_item) + return MYSQL_TYPE_NULL; /* work around about varchar type field detection */ if (type == MYSQL_TYPE_STRING && field->type() == MYSQL_TYPE_VAR_STRING) return MYSQL_TYPE_VAR_STRING; @@ -6859,6 +6861,8 @@ Field *Item_type_holder::make_field_by_type(TABLE *table) Field::NONE, name, table, get_set_pack_length(enum_set_typelib->count), enum_set_typelib, collation.collation); + case MYSQL_TYPE_NULL: + return make_string_field(table); default: break; } |