database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

bug #27531:

Browse Source 
fixed coverage of out-of-mem errors
This commit is contained in:
gkodinov/kgeorge@magare.gmz
2007-05-04 18:55:01 +03:00
parent cead246f7a
commit 13e55b8a21
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item_subselect.cc
View File

@ -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)
{ {

4
sql/sql_select.cc
View File

@ -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
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;