diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-27 19:12:07 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-27 19:12:07 +0300 |
| commit | 12414cd9f20ab6d250035b16f5a5cbc08fd6332c (patch) | |
| tree | c7c1e72770d4482daa38c3f24fb8c4ec9c38aa5c /sql/item_cmpfunc.cc | |
| parent | 72f671ab7b57ccd0fb0ed2d944081c8be894dac8 (diff) | |
| parent | 9b5cdeeb0f3fa9540df50d7feec8a703db4777ab (diff) | |
| download | mariadb-git-12414cd9f20ab6d250035b16f5a5cbc08fd6332c.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 907480ab6dc..aaf6baf87f6 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -321,11 +321,9 @@ static bool convert_const_to_int(THD *thd, Item_field *field_item, TABLE *table= field->table; sql_mode_t orig_sql_mode= thd->variables.sql_mode; enum_check_fields orig_count_cuted_fields= thd->count_cuted_fields; - my_bitmap_map *old_maps[2]; + my_bitmap_map *old_maps[2] = { NULL, NULL }; ulonglong UNINIT_VAR(orig_field_val); /* original field value if valid */ - LINT_INIT_STRUCT(old_maps); - /* table->read_set may not be set if we come here from a CREATE TABLE */ if (table && table->read_set) dbug_tmp_use_all_columns(table, old_maps, |