Skip to content
/ server Public

Commit 20b1263

Browse files
MDEV-38694 Do not override false use_parallel when select_lex has aggregate function in determining pre call
TODO: improve commit message
1 parent 104b7da commit 20b1263

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

sql/ha_partition.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6193,8 +6193,7 @@ int ha_partition::common_first_last(uchar *buf)
61936193
return error;
61946194
if (!m_ordered_scan_ongoing)
61956195
{
6196-
if (unlikely((error= handle_pre_scan(reverse_order,
6197-
check_parallel_search()))))
6196+
if (unlikely((error= handle_pre_scan(reverse_order, FALSE))))
61986197
return error;
61996198
return handle_unordered_scan_next_partition(buf, reverse_order);
62006199
}

storage/spider/ha_spider.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8309,7 +8309,8 @@ void ha_spider::check_pre_call(
83098309
select_lex, &select_limit, &offset_limit);
83108310
if (
83118311
select_lex &&
8312-
(!select_lex->limit_params.explicit_limit || !select_limit)
8312+
(!select_lex->limit_params.explicit_limit || !select_limit) &&
8313+
!select_lex->with_sum_func
83138314
) {
83148315
use_pre_call = TRUE;
83158316
}

0 commit comments

Comments
 (0)