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
359b0e59
Commit
359b0e59
authored
17 years ago
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug #27531:
fixed coverage of out-of-mem errors
parent
7539cb43
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
sql/item_subselect.cc
sql/item_subselect.cc
+1
-1
sql/sql_select.cc
sql/sql_select.cc
+2
-2
No files found.
sql/item_subselect.cc
View file @
359b0e59
...
@@ -1787,7 +1787,7 @@ int subselect_single_select_engine::exec()
...
@@ -1787,7 +1787,7 @@ int subselect_single_select_engine::exec()
select_lex
->
uncacheable
|=
UNCACHEABLE_EXPLAIN
;
select_lex
->
uncacheable
|=
UNCACHEABLE_EXPLAIN
;
select_lex
->
master_unit
()
->
uncacheable
|=
UNCACHEABLE_EXPLAIN
;
select_lex
->
master_unit
()
->
uncacheable
|=
UNCACHEABLE_EXPLAIN
;
if
(
join
->
init_save_join_tab
())
if
(
join
->
init_save_join_tab
())
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
/* purecov: inspected */
}
}
if
(
item
->
engine_changed
)
if
(
item
->
engine_changed
)
{
{
...
...
This diff is collapsed.
Click to expand it.
sql/sql_select.cc
View file @
359b0e59
...
@@ -1432,7 +1432,7 @@ JOIN::optimize()
...
@@ -1432,7 +1432,7 @@ JOIN::optimize()
*/
*/
if
(
select_lex
->
uncacheable
&&
!
is_top_level_join
()
&&
if
(
select_lex
->
uncacheable
&&
!
is_top_level_join
()
&&
init_save_join_tab
())
init_save_join_tab
())
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
-
1
);
/* purecov: inspected */
}
}
error
=
0
;
error
=
0
;
...
@@ -1509,7 +1509,7 @@ bool
...
@@ -1509,7 +1509,7 @@ bool
JOIN
::
init_save_join_tab
()
JOIN
::
init_save_join_tab
()
{
{
if
(
!
(
tmp_join
=
(
JOIN
*
)
thd
->
alloc
(
sizeof
(
JOIN
))))
if
(
!
(
tmp_join
=
(
JOIN
*
)
thd
->
alloc
(
sizeof
(
JOIN
))))
return
1
;
return
1
;
/* purecov: inspected */
error
=
0
;
// Ensure that tmp_join.error= 0
error
=
0
;
// Ensure that tmp_join.error= 0
restore_tmp
();
restore_tmp
();
return
0
;
return
0
;
...
...
This diff is collapsed.
Click to expand it.
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