diff options
| -rw-r--r-- | mysql-test/r/select_found.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/select_found.test | 7 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 |
3 files changed, 1 insertions, 13 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; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index a9c12136497..647dee80188 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2647,7 +2647,7 @@ void JOIN::exec_inner() thd->get_sent_row_count()); } else - send_records= (select_options & OPTION_FOUND_ROWS) ? 1 : 0; + send_records= 0; if (!error) { join_free(); // Unlock all cursors |