database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

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

Browse Source 
This reverts commit 443391236d.
This commit is contained in:
Oleksandr Byelkin
2020-06-10 09:34:56 +02:00
parent 443391236d
commit 61862d711d
3 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/r/select_found.result
View File

@@ -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;

7
mysql-test/t/select_found.test
View File

@@ -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;

2
sql/sql_select.cc
View File

@@ -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