Skip to content

Commit b1c2963

Browse files
MDEV-22241 Revert renaming of LEX::set_limit_rows_examined() as it breaks compatibility with ColumnStore
1 parent a4ab5da commit b1c2963

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

sql/sql_lex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3600,7 +3600,7 @@ struct LEX: public Query_tables_list
36003600
Activates enforcement of the LIMIT ROWS EXAMINED clause, if present
36013601
in the query.
36023602
*/
3603-
void activate_limit_rows_examined()
3603+
void set_limit_rows_examined()
36043604
{
36053605
if (limit_rows_examined)
36063606
limit_rows_examined_cnt= limit_rows_examined->val_uint();

sql/sql_select.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4799,7 +4799,7 @@ void JOIN::exec_inner()
47994799

48004800
if (!select_lex->outer_select() && // (1)
48014801
select_lex != select_lex->master_unit()->fake_select_lex) // (2)
4802-
thd->lex->activate_limit_rows_examined();
4802+
thd->lex->set_limit_rows_examined();
48034803

48044804
if (procedure)
48054805
{
@@ -26755,7 +26755,7 @@ JOIN_TAB::remove_duplicates()
2675526755
sort_field_keylength, having);
2675626756

2675726757
if (join->select_lex != join->select_lex->master_unit()->fake_select_lex)
26758-
thd->lex->activate_limit_rows_examined();
26758+
thd->lex->set_limit_rows_examined();
2675926759
free_blobs(first_field);
2676026760
my_free(sortorder);
2676126761
DBUG_RETURN(error);

sql/sql_union.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2180,7 +2180,7 @@ bool st_select_lex_unit::exec()
21802180
// Handle cleanup on scope exit
21812181
SCOPE_EXIT([this, &limit_rows_was_activated, &examined_rows]() {
21822182
if (limit_rows_was_activated)
2183-
thd->lex->activate_limit_rows_examined();
2183+
thd->lex->set_limit_rows_examined();
21842184
if (!saved_error)
21852185
thd->inc_examined_row_count(examined_rows);
21862186
});

0 commit comments

Comments
 (0)