diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-27 16:26:53 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-27 16:26:53 +0300 |
| commit | 9b5cdeeb0f3fa9540df50d7feec8a703db4777ab (patch) | |
| tree | c487800462d4705f07ac6f0bfd4234646fa688d7 /sql | |
| parent | ea2b19dee6a6ed69faffa368c9b1ce9338556299 (diff) | |
| parent | 2911a9a693512ec7d4903313028d252a8374e56e (diff) | |
| download | mariadb-git-9b5cdeeb0f3fa9540df50d7feec8a703db4777ab.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_cmpfunc.cc | 4 | ||||
| -rw-r--r-- | sql/opt_subselect.h | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index e656b23b8ee..9110f348a43 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, diff --git a/sql/opt_subselect.h b/sql/opt_subselect.h index 14730ecbd11..d7978e9ef73 100644 --- a/sql/opt_subselect.h +++ b/sql/opt_subselect.h @@ -95,7 +95,7 @@ class Loose_scan_opt public: Loose_scan_opt(): - try_loosescan(FALSE), + try_loosescan(false), bound_sj_equalities(0), quick_uses_applicable_index(0), quick_max_loose_keypart(0), @@ -103,10 +103,11 @@ public: best_loose_scan_cost(0), best_loose_scan_records(0), best_loose_scan_start_key(NULL), - best_max_loose_keypart(0) + best_max_loose_keypart(0), + best_ref_depend_map(0) { } - + void init(JOIN *join, JOIN_TAB *s, table_map remaining_tables) { /* |