Commit 61862d71 authored by Oleksandr Byelkin's avatar Oleksandr Byelkin

Revert "MDEV-22830: SQL_CALC_FOUND_ROWS not working properly for single SELECT for DUAL"

This reverts commit 44339123.
parent 44339123
...@@ -362,9 +362,4 @@ c1 ...@@ -362,9 +362,4 @@ c1
select found_rows(); select found_rows();
found_rows() found_rows()
5 5
SELECT SQL_CALC_FOUND_ROWS 1 FROM DUAL WHERE 0;
1
SELECT FOUND_ROWS();
FOUND_ROWS()
1
drop table t1; drop table t1;
...@@ -286,11 +286,4 @@ select * from t1 order by c1 limit 2,1; ...@@ -286,11 +286,4 @@ select * from t1 order by c1 limit 2,1;
select found_rows(); select found_rows();
select sql_calc_found_rows * from t1 order by c1 limit 2,1; select sql_calc_found_rows * from t1 order by c1 limit 2,1;
select found_rows(); select found_rows();
#
# MDEV-22830 SQL_CALC_FOUND_ROWS not working properly for single SELECT for DUAL
#
SELECT SQL_CALC_FOUND_ROWS 1 FROM DUAL WHERE 0;
SELECT FOUND_ROWS();
drop table t1; drop table t1;
...@@ -2647,7 +2647,7 @@ void JOIN::exec_inner() ...@@ -2647,7 +2647,7 @@ void JOIN::exec_inner()
thd->get_sent_row_count()); thd->get_sent_row_count());
} }
else else
send_records= (select_options & OPTION_FOUND_ROWS) ? 1 : 0; send_records= 0;
if (!error) if (!error)
{ {
join_free(); // Unlock all cursors join_free(); // Unlock all cursors
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment