1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge remote-tracking branch '5.5' into 10.0

This commit is contained in:
Vicențiu Ciorbaru
2017-06-20 12:31:17 +03:00
20 changed files with 623 additions and 45 deletions

View File

@ -534,6 +534,8 @@ typedef struct st_join_table {
!(used_sjm_lookup_tables & ~emb_sj_nest->sj_inner_tables));
}
bool keyuse_is_valid_for_access_in_chosen_plan(JOIN *join, KEYUSE *keyuse);
void remove_redundant_bnl_scan_conds();
} JOIN_TAB;
@ -1000,6 +1002,11 @@ public:
to materialize and access by lookups
*/
table_map sjm_lookup_tables;
/**
Bitmap of semijoin tables that the chosen plan decided
to materialize to scan the results of materialization
*/
table_map sjm_scan_tables;
/*
Constant tables for which we have found a row (as opposed to those for
which we didn't).
@ -1341,6 +1348,7 @@ public:
pre_sort_join_tab= NULL;
emb_sjm_nest= NULL;
sjm_lookup_tables= 0;
sjm_scan_tables= 0;
exec_saved_explain= false;
/*