summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-06-10 09:34:56 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2020-06-10 09:34:56 +0200
commit61862d711deadc9feadc91633104a78c1977bc5e (patch)
tree2ba5906104eaa1e18d152ee0eda2655d9616b1e9 /mysql-test
parent443391236d20cd0303fcc9957eb49a6aaf28316e (diff)
downloadmariadb-git-61862d711deadc9feadc91633104a78c1977bc5e.tar.gz
Revert "MDEV-22830: SQL_CALC_FOUND_ROWS not working properly for single SELECT for DUAL"
This reverts commit 443391236d20cd0303fcc9957eb49a6aaf28316e.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/select_found.result5
-rw-r--r--mysql-test/t/select_found.test7
2 files changed, 0 insertions, 12 deletions
diff --git a/mysql-test/r/select_found.result b/mysql-test/r/select_found.result
index c281dc885ad..7b38515cf70 100644
--- a/mysql-test/r/select_found.result
+++ b/mysql-test/r/select_found.result
@@ -362,9 +362,4 @@ c1
select found_rows();
found_rows()
5
-SELECT SQL_CALC_FOUND_ROWS 1 FROM DUAL WHERE 0;
-1
-SELECT FOUND_ROWS();
-FOUND_ROWS()
-1
drop table t1;
diff --git a/mysql-test/t/select_found.test b/mysql-test/t/select_found.test
index 092ffc00cdc..33613697722 100644
--- a/mysql-test/t/select_found.test
+++ b/mysql-test/t/select_found.test
@@ -286,11 +286,4 @@ select * from t1 order by c1 limit 2,1;
select found_rows();
select sql_calc_found_rows * from t1 order by c1 limit 2,1;
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;