diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-23 08:06:17 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-23 08:06:17 +0300 |
commit | efb8485d85b19a2a729310adc6779ca649198f29 (patch) | |
tree | a2b7778acfecd95d2f5b1fcff588d93268afa112 /sql/opt_subselect.h | |
parent | 235cf969d21ba3406a9325d952fda47c589e58d6 (diff) | |
parent | b96e4424fb4d35dd5de52f44ed6b726a3f0dd010 (diff) | |
download | mariadb-git-efb8485d85b19a2a729310adc6779ca649198f29.tar.gz |
Merge 10.3 into 10.4, except for MDEV-20265
The MDEV-20265 commit e746f451d57def4be679caafc29976741b3e89f7
introduces DBUG_ASSERT(right_op == r_tbl) in
st_select_lex::add_cross_joined_table(), and that assertion would
fail in several tests that exercise joins. That commit was skipped
in this merge, and a separate fix of MDEV-20265 will be necessary in 10.4.
Diffstat (limited to 'sql/opt_subselect.h')
-rw-r--r-- | sql/opt_subselect.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sql/opt_subselect.h b/sql/opt_subselect.h index 65131f6bc89..6210fc972c8 100644 --- a/sql/opt_subselect.h +++ b/sql/opt_subselect.h @@ -96,15 +96,14 @@ public: Loose_scan_opt(): try_loosescan(FALSE), bound_sj_equalities(0), - quick_uses_applicable_index(FALSE) + quick_uses_applicable_index(0), + quick_max_loose_keypart(0), + best_loose_scan_key(0), + best_loose_scan_cost(0), + best_loose_scan_records(0), + best_loose_scan_start_key(NULL), + best_max_loose_keypart(0) { - /* Protected by quick_uses_applicable_index */ - LINT_INIT(quick_max_loose_keypart); - /* The following are protected by best_loose_scan_cost!= DBL_MAX */ - LINT_INIT(best_loose_scan_key); - LINT_INIT(best_loose_scan_records); - LINT_INIT(best_max_loose_keypart); - LINT_INIT(best_loose_scan_start_key); } void init(JOIN *join, JOIN_TAB *s, table_map remaining_tables) |