database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Remove garbage comments

Browse Source
This commit is contained in:
Sergey Petrunya
2010-10-10 22:43:19 +03:00
parent a285ce3e58
commit 51294f5948
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_join_cache.cc
View File

@@ -1812,10 +1812,6 @@ enum_nested_loop_state JOIN_CACHE_BNL::join_matching_records(bool skip_last)
if (err < 0) if (err < 0)
return NESTED_LOOP_ERROR; return NESTED_LOOP_ERROR;
rc= NESTED_LOOP_OK; rc= NESTED_LOOP_OK;
//psergey3-merge: todo: check if all other places in this file
// should have the
// skip_record(...) <0 --> return error
// code.
/* Prepare to read records from the join buffer */ /* Prepare to read records from the join buffer */
reset(FALSE); reset(FALSE);

7
sql/sql_select.cc
View File

@@ -6052,7 +6052,6 @@ get_best_combination(JOIN *join)
TABLE *form; TABLE *form;
*j= *join->best_positions[tablenr].table; *j= *join->best_positions[tablenr].table;
form=join->table[tablenr]=j->table; form=join->table[tablenr]=j->table;
//psergey-merge: or is the above: form=join->all_tables[tablenr]=j->table;
used_tables|= form->map; used_tables|= form->map;
form->reginfo.join_tab=j; form->reginfo.join_tab=j;
if (!*j->on_expr_ref) if (!*j->on_expr_ref)
@@ -10114,16 +10113,10 @@ static uint reset_nj_counters(JOIN *join, List<TABLE_LIST> *join_list)
if ((nested_join= table->nested_join)) if ((nested_join= table->nested_join))
{ {
nested_join->counter= 0; nested_join->counter= 0;
//nested_join->n_tables= my_count_bits(nested_join->used_tables &
// ~join->eliminated_tables);
nested_join->n_tables= reset_nj_counters(join, &nested_join->join_list); nested_join->n_tables= reset_nj_counters(join, &nested_join->join_list);
if (!nested_join->n_tables) if (!nested_join->n_tables)
is_eliminated_nest= TRUE; is_eliminated_nest= TRUE;
} }
//if (!table->table || (table->table->map & ~join->eliminated_tables))
//psergey-merge10^
//if (!table->table && (table->table->map & ~join->eliminated_tables))
//psergey-merge11^
if ((!table->table && !is_eliminated_nest) || if ((!table->table && !is_eliminated_nest) ||
(table->table && (table->table->map & ~join->eliminated_tables))) (table->table && (table->table->map & ~join->eliminated_tables)))
n++; n++;