At file:///home/psergey/dev/maria-5.3-subqueries-r12/ ------------------------------------------------------------ revno: 2798 revision-id: psergey@askmonty.org-20100524111738-v42kti5y5j185nbn parent: psergey@askmonty.org-20100523191318-382z9m2tt30l31h7 committer: Sergey Petrunya <psergey@askmonty.org> branch nick: maria-5.3-subqueries-r12 timestamp: Mon 2010-05-24 15:17:38 +0400 message: Code cleanup, remove junk comments === modified file 'sql/item_subselect.cc' --- a/sql/item_subselect.cc 2010-05-23 19:13:18 +0000 +++ b/sql/item_subselect.cc 2010-05-24 11:17:38 +0000 @@ -727,9 +727,6 @@ void Item_singlerow_subselect::store(uint i, Item *item) { row[i]->store(item); - //psergey-merge: can do without that: row[i]->cache_value(); - //psergey-backport-timours: ^ really, without that ^ - //psergey-try-merge-again: row[i]->cache_value(); } === modified file 'sql/opt_subselect.cc' --- a/sql/opt_subselect.cc 2010-05-23 19:13:18 +0000 +++ b/sql/opt_subselect.cc 2010-05-24 11:17:38 +0000 @@ -1159,7 +1159,7 @@ parent_join->select_lex->where= parent_join->conds; } - /* Don't unlink the child, the subquery is still there and used */ + /* Don't unlink the child subselect, as the subquery will be used. */ DBUG_RETURN(FALSE); } === modified file 'sql/sql_select.cc' --- a/sql/sql_select.cc 2010-05-23 19:13:18 +0000 +++ b/sql/sql_select.cc 2010-05-24 11:17:38 +0000 @@ -4743,18 +4743,6 @@ } else { -#if 0 - /* Estimate cost of reading table. */ - if (jtbm_subselect) //psergey-jtbm-todo: why the difference? - tmp= s->read_time; - else - tmp= s->table->file->scan_time(); - //psergey-debug: - if (!jtbm_subselect && fabs(s->read_time - s->table->file->scan_time()) > 1.0) - { - fprintf(stderr, "Q:%s\n", thd->query()); - } -#endif tmp= s->read_time; if ((s->table->map & join->outer_join) || disable_jbuf) // Can't use join cache { @@ -9909,16 +9897,10 @@ if ((nested_join= table->nested_join)) { 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); if (!nested_join->n_tables) 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) || (table->table && (table->table->map & ~join->eliminated_tables))) n++;