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
7b9bcaa5
Commit
7b9bcaa5
authored
Dec 17, 2010
by
Sergey Petrunya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MWL#90: Post-merge fixes: add mixing typecasts to remove compiler warnings
parent
6bf60dc3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
sql/opt_subselect.cc
sql/opt_subselect.cc
+1
-1
sql/sql_select.cc
sql/sql_select.cc
+2
-2
sql/sql_select.h
sql/sql_select.h
+2
-1
No files found.
sql/opt_subselect.cc
View file @
7b9bcaa5
...
@@ -831,7 +831,7 @@ void get_delayed_table_estimates(TABLE *table,
...
@@ -831,7 +831,7 @@ void get_delayed_table_estimates(TABLE *table,
rows
*=
join
->
best_positions
[
i
].
records_read
;
rows
*=
join
->
best_positions
[
i
].
records_read
;
read_time
+=
join
->
best_positions
[
i
].
read_time
;
read_time
+=
join
->
best_positions
[
i
].
read_time
;
}
}
*
out_rows
=
rows
;
*
out_rows
=
(
ha_rows
)
rows
;
*
startup_cost
=
read_time
;
*
startup_cost
=
read_time
;
/* Calculate cost of scanning the temptable */
/* Calculate cost of scanning the temptable */
double
data_size
=
rows
*
hash_sj_engine
->
tmp_table
->
s
->
reclength
;
double
data_size
=
rows
*
hash_sj_engine
->
tmp_table
->
s
->
reclength
;
...
...
sql/sql_select.cc
View file @
7b9bcaa5
...
@@ -6253,7 +6253,7 @@ get_best_combination(JOIN *join)
...
@@ -6253,7 +6253,7 @@ get_best_combination(JOIN *join)
sub-order
sub-order
*/
*/
SJ_MATERIALIZATION_INFO
*
sjm
=
cur_pos
->
table
->
emb_sj_nest
->
sj_mat_info
;
SJ_MATERIALIZATION_INFO
*
sjm
=
cur_pos
->
table
->
emb_sj_nest
->
sj_mat_info
;
j
->
records
=
j
->
records_read
=
sjm
->
is_sj_scan
?
sjm
->
rows
:
1
;
j
->
records
=
j
->
records_read
=
(
ha_rows
)(
sjm
->
is_sj_scan
?
sjm
->
rows
:
1
)
;
JOIN_TAB
*
jt
=
(
JOIN_TAB
*
)
join
->
thd
->
alloc
(
sizeof
(
JOIN_TAB
)
*
sjm
->
tables
);
JOIN_TAB
*
jt
=
(
JOIN_TAB
*
)
join
->
thd
->
alloc
(
sizeof
(
JOIN_TAB
)
*
sjm
->
tables
);
JOIN_TAB_RANGE
*
jt_range
=
new
JOIN_TAB_RANGE
;
JOIN_TAB_RANGE
*
jt_range
=
new
JOIN_TAB_RANGE
;
jt_range
->
start
=
jt
;
jt_range
->
start
=
jt
;
...
@@ -6303,7 +6303,7 @@ get_best_combination(JOIN *join)
...
@@ -6303,7 +6303,7 @@ get_best_combination(JOIN *join)
else
if
(
create_ref_for_key
(
join
,
j
,
keyuse
,
used_tables
))
else
if
(
create_ref_for_key
(
join
,
j
,
keyuse
,
used_tables
))
DBUG_RETURN
(
TRUE
);
// Something went wrong
DBUG_RETURN
(
TRUE
);
// Something went wrong
loop_end:
loop_end:
j
->
records_read
=
join
->
best_positions
[
tablenr
].
records_read
;
j
->
records_read
=
(
ha_rows
)
join
->
best_positions
[
tablenr
].
records_read
;
join
->
map2table
[
j
->
table
->
tablenr
]
=
j
;
join
->
map2table
[
j
->
table
->
tablenr
]
=
j
;
// If we've reached the end of sjm nest, switch back to main sequence
// If we've reached the end of sjm nest, switch back to main sequence
...
...
sql/sql_select.h
View file @
7b9bcaa5
...
@@ -243,7 +243,8 @@ typedef struct st_join_table {
...
@@ -243,7 +243,8 @@ typedef struct st_join_table {
E(#records) is in found_records.
E(#records) is in found_records.
*/
*/
double
read_time
;
double
read_time
;
/* psergey-todo: make the below have type double, like POSITION::records_read? */
ha_rows
records_read
;
ha_rows
records_read
;
/* Startup cost for execution */
/* Startup cost for execution */
...
...
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