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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
9f4d8208
Commit
9f4d8208
authored
Oct 16, 2006
by
istruewing@chilla.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge chilla.local:/home/mydev/mysql-4.1-bug12240
into chilla.local:/home/mydev/mysql-5.0-bug12240
parents
014c1c88
c4dee7ca
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
6 deletions
+18
-6
sql/sql_select.cc
sql/sql_select.cc
+18
-6
No files found.
sql/sql_select.cc
View file @
9f4d8208
...
...
@@ -1364,12 +1364,13 @@ JOIN::exec()
thd
->
examined_row_count
=
0
;
DBUG_VOID_RETURN
;
}
/*
don't reset the found rows count if there're no tables
as FOUND_ROWS() may be called.
*/
/*
Don't reset the found rows count if there're no tables as
FOUND_ROWS() may be called. Never reset the examined row count here.
It must be accumulated from all join iterations of all join parts.
*/
if
(
tables
)
thd
->
limit_found_rows
=
thd
->
examined_row_count
=
0
;
thd
->
limit_found_rows
=
0
;
if
(
zero_result_cause
)
{
...
...
@@ -1417,6 +1418,12 @@ JOIN::exec()
List
<
Item
>
*
curr_all_fields
=
&
all_fields
;
List
<
Item
>
*
curr_fields_list
=
&
fields_list
;
TABLE
*
curr_tmp_table
=
0
;
/*
Initialize examined rows here because the values from all join parts
must be accumulated in examined_row_count. Hence every join
iteration must count from zero.
*/
curr_join
->
examined_rows
=
0
;
if
((
curr_join
->
select_lex
->
options
&
OPTION_SCHEMA_TABLE
)
&&
get_schema_tables_result
(
curr_join
))
...
...
@@ -1823,9 +1830,12 @@ JOIN::exec()
Protocol
::
SEND_NUM_ROWS
|
Protocol
::
SEND_EOF
);
error
=
do_select
(
curr_join
,
curr_fields_list
,
NULL
,
procedure
);
thd
->
limit_found_rows
=
curr_join
->
send_records
;
thd
->
examined_row_count
=
curr_join
->
examined_rows
;
}
/* Accumulate the counts from all join iterations of all join parts. */
thd
->
examined_row_count
+=
curr_join
->
examined_rows
;
DBUG_PRINT
(
"counts"
,
(
"thd->examined_row_count: %lu"
,
(
ulong
)
thd
->
examined_row_count
));
DBUG_VOID_RETURN
;
}
...
...
@@ -10129,6 +10139,8 @@ evaluate_join_record(JOIN *join, JOIN_TAB *join_tab,
*/
join
->
examined_rows
++
;
join
->
thd
->
row_count
++
;
DBUG_PRINT
(
"counts"
,
(
"join->examined_rows++: %lu"
,
(
ulong
)
join
->
examined_rows
));
if
(
found
)
{
...
...
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