database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt

Browse Source 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
This commit is contained in:
holyfoot/hf@hfmain.(none)
2007-05-07 16:12:42 +05:00
parent 41c2ee8723 6ca4db2607
commit 763d4bf22e
11 changed files with 167 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_select.cc
View File

@ -1442,7 +1442,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;
@ -1519,7 +1519,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;