diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-10-11 12:26:15 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-10-13 09:40:41 +0200 |
| commit | 1ae02f0e0d28bfca037ec35c4fda5b01c853b09f (patch) | |
| tree | 13af954bcd05c91a9a937d675c28f2e16e9ef9af /sql/sql_union.cc | |
| parent | eb0804ef5e7eeb059bb193c3c6787e8a4188d34d (diff) | |
| download | mariadb-git-1ae02f0e0d28bfca037ec35c4fda5b01c853b09f.tar.gz | |
MDEV-18553: MDEV-16327 pre-requisits part 2: uniform of LIMIT/OFFSET handling
Now both offset and limit are stored and do not chenged during execution
(offset is decreased during processing in versions before 10.5).
(Big part of this changes made by Monty)
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index c10742737b5..47af00865c1 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -111,8 +111,6 @@ int select_unit::send_data(List<Item> &values) { int rc= 0; int not_reported_error= 0; - if (unit->lim.check_and_move_offset()) - return 0; // using limit offset,count if (thd->killed == ABORT_QUERY) return 0; if (table->no_rows_with_nulls) @@ -604,8 +602,6 @@ int select_unit_ext::send_data(List<Item> &values) int rc= 0; int not_reported_error= 0; int find_res; - if (unit->lim.check_and_move_offset()) - return 0; if (thd->killed == ABORT_QUERY) return 0; if (table->no_rows_with_nulls) @@ -2200,7 +2196,6 @@ bool st_select_lex_unit::exec() } if (!sl->tvc) saved_error= sl->join->error; - lim.reset(); if (likely(!saved_error)) { examined_rows+= thd->get_examined_row_count(); |