1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code cleanup (1)

Browse Source
This commit is contained in:
Sergey Petrunya 2011-02-19 00:22:38 +03:00
parent 2c7c230a59
commit e7aa18fb9c
5 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_base.cc
View File

@ -7787,8 +7787,8 @@ bool setup_tables(THD *thd, Name_resolution_context *context,
DBUG_RETURN(1); DBUG_RETURN(1);
} }
DBUG_ASSERT(item == table_list->jtbm_subselect); DBUG_ASSERT(item == table_list->jtbm_subselect);
table_list->jtbm_subselect->setup_engine(FALSE); if (table_list->jtbm_subselect->setup_engine(FALSE))
//psergey-merge: ^ todo: error checking! DBUG_RETURN(1);
} }
} }

2
sql/sql_join_cache.cc
View File

@ -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 */ /* 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() */ goto finish; /* psergey-note: if this returns error, we will assert in net_send_statement() */
if ((rc= join_tab_execution_startup(join_tab)) < 0) if ((rc= join_tab_execution_startup(join_tab)) < 0)

5
sql/sql_join_cache.h
View File

@ -121,11 +121,6 @@ protected:
*/ */
JOIN *join; 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. 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 That is, tables in the [start_tab, tab) range can have their fields in the

14
sql/sql_select.cc
View File

@ -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)) if (cp_buffer_from_ref(tab->join->thd, table, &tab->ref))
return -1; return -1;
if ((error= table->file->ha_index_read_map(table->record[0], if ((error= table->file->ha_index_read_map(table->record[0],

3
sql/sql_select.h
View File

@ -357,9 +357,6 @@ typedef struct st_join_table {
*/ */
uint sj_strategy; uint sj_strategy;
//psergey-merge: todo: stop using this:
struct st_join_table *first_sjm_sibling;
void cleanup(); void cleanup();
inline bool is_using_loose_index_scan() inline bool is_using_loose_index_scan()
{ {