From 1ae02f0e0d28bfca037ec35c4fda5b01c853b09f Mon Sep 17 00:00:00 2001 From: Oleksandr Byelkin Date: Fri, 11 Oct 2019 12:26:15 +0200 Subject: 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) --- sql/sql_error.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sql/sql_error.cc') diff --git a/sql/sql_error.cc b/sql/sql_error.cc index c38ecfff6e6..92a1adb8ab7 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -808,14 +808,14 @@ bool mysqld_show_warnings(THD *thd, ulong levels_to_show) Diagnostics_area::Sql_condition_iterator it= thd->get_stmt_da()->sql_conditions(); - for (idx= 1; (err= it++) ; idx++) + for (idx= 0; (err= it++) ; idx++) { /* Skip levels that the user is not interested in */ if (!(levels_to_show & ((ulong) 1 << err->get_level()))) continue; - if (unit->lim.check_and_move_offset()) + if (unit->lim.check_offset(idx)) continue; // using limit offset,count - if (idx > unit->lim.get_select_limit()) + if (idx >= unit->lim.get_select_limit()) break; protocol->prepare_for_resend(); protocol->store(warning_level_names[err->get_level()].str, -- cgit v1.2.1