Commit 1c88ac60 authored by Monty's avatar Monty Committed by Sergei Petrunia

Simple cleanup of removing QQ comments from sql_select.cc

- The comment in test_if_skip_sort_order was removed together with
  a not needed test of 'select'
parent c1512b1e
...@@ -9764,7 +9764,6 @@ optimize_straight_join(JOIN *join, table_map remaining_tables) ...@@ -9764,7 +9764,6 @@ optimize_straight_join(JOIN *join, table_map remaining_tables)
{ {
/* Adjust records_out to contain the final number of rows */ /* Adjust records_out to contain the final number of rows */
double ratio= current_record_count / original_record_count; double ratio= current_record_count / original_record_count;
/* QQQ This is just to stop an assert later */
if (ratio < 1) if (ratio < 1)
{ {
position->records_out*= ratio; position->records_out*= ratio;
...@@ -11047,7 +11046,6 @@ best_extension_by_limited_search(JOIN *join, ...@@ -11047,7 +11046,6 @@ best_extension_by_limited_search(JOIN *join,
{ {
/* Adjust records_out and current_record_count after semi join */ /* Adjust records_out and current_record_count after semi join */
double ratio= current_record_count / original_record_count; double ratio= current_record_count / original_record_count;
/* QQQ This is just to stop an assert later */
if (ratio < 1.0) if (ratio < 1.0)
position->records_out*= ratio; position->records_out*= ratio;
if (unlikely(trace_one_table.trace_started())) if (unlikely(trace_one_table.trace_started()))
...@@ -25622,8 +25620,7 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit, ...@@ -25622,8 +25620,7 @@ test_if_skip_sort_order(JOIN_TAB *tab,ORDER *order,ha_rows select_limit,
!(table->file->index_flags(best_key, 0, 1) & HA_CLUSTERED_INDEX))) !(table->file->index_flags(best_key, 0, 1) & HA_CLUSTERED_INDEX)))
goto use_filesort; goto use_filesort;
if (select && // psergey: why doesn't this use a quick? if (table->opt_range_keys.is_set(best_key) && best_key != ref_key)
table->opt_range_keys.is_set(best_key) && best_key != ref_key)
{ {
key_map tmp_map; key_map tmp_map;
tmp_map.clear_all(); // Force the creation of quick select tmp_map.clear_all(); // Force the creation of quick select
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment