diff options
| -rw-r--r-- | sql/sql_base.cc | 4 | ||||
| -rw-r--r-- | sql/sql_join_cache.cc | 2 | ||||
| -rw-r--r-- | sql/sql_join_cache.h | 5 | ||||
| -rw-r--r-- | sql/sql_select.cc | 14 | ||||
| -rw-r--r-- | sql/sql_select.h | 3 |
5 files changed, 3 insertions, 25 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 43af95ae53d..34f5f5e9d5d 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -7787,8 +7787,8 @@ bool setup_tables(THD *thd, Name_resolution_context *context, DBUG_RETURN(1); } DBUG_ASSERT(item == table_list->jtbm_subselect); - table_list->jtbm_subselect->setup_engine(FALSE); - //psergey-merge: ^ todo: error checking! + if (table_list->jtbm_subselect->setup_engine(FALSE)) + DBUG_RETURN(1); } } diff --git a/sql/sql_join_cache.cc b/sql/sql_join_cache.cc index 134af78d43b..b7062747073 100644 --- a/sql/sql_join_cache.cc +++ b/sql/sql_join_cache.cc @@ -2219,7 +2219,7 @@ enum_nested_loop_state JOIN_CACHE::join_matching_records(bool skip_last) } /* Prepare to retrieve all records of the joined table */ - if ((error= join_tab_scan->open())) //psergey-merge: TODO: look what it does inside? status-reset should use next_linear_tab + if ((error= join_tab_scan->open())) goto finish; /* psergey-note: if this returns error, we will assert in net_send_statement() */ if ((rc= join_tab_execution_startup(join_tab)) < 0) diff --git a/sql/sql_join_cache.h b/sql/sql_join_cache.h index 866c53339c9..6aa15adabe3 100644 --- a/sql/sql_join_cache.h +++ b/sql/sql_join_cache.h @@ -121,11 +121,6 @@ protected: */ JOIN *join; - /* - Cardinality of the range of join tables whose fields can be put into the - cache. A table from the range not necessarily contributes to the cache. - */ - // psergey-merge: gone: uint tables; /* JOIN_TAB of the first table that can have it's fields in the join cache. That is, tables in the [start_tab, tab) range can have their fields in the diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 8eaed3f7eac..457b6e3e2d8 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -14728,20 +14728,6 @@ join_read_always_key(JOIN_TAB *tab) } } - // psergey-merge:todo: should the below be removed: ? - // if not, what's the BKA equivalent for it? - // (example: this is needed for outer joins where we can't do early NULL - // filtering because we'll still need to produce NULL-complemented records) - /* Perform "Late NULLs Filtering" (see internals manual for explanations) */ -#if 0 - Not needed? - for (uint i= 0 ; i < tab->ref.key_parts ; i++) - { - if ((tab->ref.null_rejecting & 1 << i) && tab->ref.items[i]->is_null()) - return -1; - } -#endif - if (cp_buffer_from_ref(tab->join->thd, table, &tab->ref)) return -1; if ((error= table->file->ha_index_read_map(table->record[0], diff --git a/sql/sql_select.h b/sql/sql_select.h index e1e558fceff..7d6a5d2b7f3 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -357,9 +357,6 @@ typedef struct st_join_table { */ uint sj_strategy; - //psergey-merge: todo: stop using this: - struct st_join_table *first_sjm_sibling; - void cleanup(); inline bool is_using_loose_index_scan() { |