Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
61862d71
Commit
61862d71
authored
Jun 10, 2020
by
Oleksandr Byelkin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "MDEV-22830: SQL_CALC_FOUND_ROWS not working properly for single SELECT for DUAL"
This reverts commit
44339123
.
parent
44339123
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
13 deletions
+1
-13
mysql-test/r/select_found.result
mysql-test/r/select_found.result
+0
-5
mysql-test/t/select_found.test
mysql-test/t/select_found.test
+0
-7
sql/sql_select.cc
sql/sql_select.cc
+1
-1
No files found.
mysql-test/r/select_found.result
View file @
61862d71
...
@@ -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;
mysql-test/t/select_found.test
View file @
61862d71
...
@@ -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
;
sql/sql_select.cc
View file @
61862d71
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment