diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-04-22 22:51:43 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-04-22 22:51:43 +0400 |
| commit | fac2a7a85dab10ef6cc7628f635fe5a3736514a6 (patch) | |
| tree | 2519271f97ae9838fb0ef196aabe2437726e2219 /sql/item.cc | |
| parent | 97fb1f26797828427ad850b0420aaafc74205e71 (diff) | |
| download | mariadb-git-fac2a7a85dab10ef6cc7628f635fe5a3736514a6.tar.gz | |
MDEV-12495 Conditional jump depends on uninitialised value for: SELECT NULL UNION geom_expression
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index dbec742e4a2..ceb8d984d9e 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -9464,7 +9464,10 @@ void Item_cache_row::set_null() Item_type_holder::Item_type_holder(THD *thd, Item *item) - :Item(thd, item), enum_set_typelib(0), fld_type(get_real_type(item)) + :Item(thd, item), + enum_set_typelib(0), + fld_type(get_real_type(item)), + geometry_type(Field::GEOM_GEOMETRY) { DBUG_ASSERT(item->fixed); maybe_null= item->maybe_null; |