From 850fb901770d8a40a2a8d0cee7737089153e5cc4 Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Sat, 6 Oct 2012 11:10:59 +0400 Subject: [PATCH] Remove unneeded comments --- sql/sql_select.cc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 7a23a71e040..c46d7cdb30c 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -19038,14 +19038,6 @@ create_sort_index(THD *thd, JOIN *join, ORDER *order, /* Currently ORDER BY ... LIMIT is not supported in subqueries. */ DBUG_ASSERT(join->group_list || !join->is_in_subquery()); - /* - If we have a select->quick object that is created outside of - create_sort_index() and this is part of a subquery that - potentially can be executed multiple times then we should not - delete the quick object on exit from this function. - */ - //bool keep_quick= select && select->quick && join->join_tab_save; - /* When there is SQL_BIG_RESULT do not sort using index for GROUP BY, and thus force sorting on disk unless a group min-max optimization @@ -19097,7 +19089,6 @@ create_sort_index(THD *thd, JOIN *join, ORDER *order, get_quick_select_for_ref(thd, table, &tab->ref, tab->found_records)))) goto err; - //DBUG_ASSERT(!keep_quick);//psergey-post-merge-check quick_created= TRUE; } } @@ -19145,6 +19136,7 @@ create_sort_index(THD *thd, JOIN *join, ORDER *order, /*TODO: here, close the index scan, cancel index-only read. */ tab->records= table->sort.found_records; // For SQL_CALC_ROWS #if 0 + /* MariaDB doesn't need the following: */ if (select) { /*