Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Kirill Smelkov
mariadb
Commits
13e55b8a
Commit
13e55b8a
authored
17 years ago
by
gkodinov/kgeorge@magare.gmz
Browse files
Options
Download
Email Patches
Plain Diff
bug #27531:
fixed coverage of out-of-mem errors
parent
cead246f
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 @
13e55b8a
...
...
@@ -1787,7 +1787,7 @@ int subselect_single_select_engine::exec()
select_lex
->
uncacheable
|=
UNCACHEABLE_EXPLAIN
;
select_lex
->
master_unit
()
->
uncacheable
|=
UNCACHEABLE_EXPLAIN
;
if
(
join
->
init_save_join_tab
())
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
/* purecov: inspected */
}
if
(
item
->
engine_changed
)
{
...
...
This diff is collapsed.
Click to expand it.
sql/sql_select.cc
View file @
13e55b8a
...
...
@@ -1432,7 +1432,7 @@ JOIN::optimize()
*/
if (select_lex->uncacheable && !is_top_level_join() &&
init_save_join_tab())
DBUG_RETURN(-1);
DBUG_RETURN(-1);
/* purecov: inspected */
}
error= 0;
...
...
@@ -1509,7 +1509,7 @@ bool
JOIN::init_save_join_tab()
{
if (!(tmp_join= (JOIN*)thd->alloc(sizeof(JOIN))))
return 1;
return 1;
/* purecov: inspected */
error= 0; // Ensure that tmp_join.error= 0
restore_tmp();
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