database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-18553: MDEV-16327 pre-requisits part 1: isolation of LIMIT/OFFSET handling

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-09-26 09:49:50 +02:00
parent 8336371441
commit eb0804ef5e
18 changed files with 198 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_profile.cc
View File

@ -402,7 +402,7 @@ bool PROFILING::show_profiles()
MEM_ROOT *mem_root= thd->mem_root;
SELECT_LEX *sel= thd->lex->first_select_lex();
SELECT_LEX_UNIT *unit= &thd->lex->unit;
ha_rows idx= 0;
ha_rows idx;
Protocol *protocol= thd->protocol;
void *iterator;
DBUG_ENTER("PROFILING::show_profiles");
@ -426,9 +426,9 @@ bool PROFILING::show_profiles()
unit->set_limit(sel);
for (iterator= history.new_iterator();
for (iterator= history.new_iterator(), idx= 1;
iterator != NULL;
iterator= history.iterator_next(iterator))
iterator= history.iterator_next(iterator), idx++)
{
prof= history.iterator_value(iterator);
@ -436,9 +436,9 @@ bool PROFILING::show_profiles()
double query_time_usecs= prof->m_end_time_usecs - prof->m_start_time_usecs;
if (++idx <= unit->offset_limit_cnt)
if (unit->lim.check_and_move_offset())
continue;
if (idx > unit->select_limit_cnt)
if (idx > unit->lim.get_select_limit())
break;
protocol->prepare_for_resend();