diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2018-06-20 08:29:07 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2018-06-20 08:29:07 +0200 |
commit | b534a7b89ef39cd75bfe09524be044bc16ea2f48 (patch) | |
tree | 918ef4b944034bac270edd13f82d0a3abb973c7e /sql | |
parent | 083279f7838d45c475344d20585ead72a147a21d (diff) | |
parent | 956b296248acbe35aa87f056ccf99dbb999eea02 (diff) | |
download | mariadb-git-b534a7b89ef39cd75bfe09524be044bc16ea2f48.tar.gz |
Merge branch '10.3' into bb-10.3-fix_len_dec
Diffstat (limited to 'sql')
-rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 73bd29642ef..fbd2f43ad25 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -16814,7 +16814,10 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, if (result && modify_item) field->result_field= result; if (orig_item) + { item->maybe_null= save_maybe_null; + result->field_name= orig_item->name; + } } else if (table_cant_handle_bit_fields && field->field->type() == MYSQL_TYPE_BIT) |