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

merged

Browse Source
This commit is contained in:
serg@serg.mylan
2004-05-15 11:26:58 +02:00
parent da63a927f2 9f171e7794
commit 0dc8aacf7d
52 changed files with 608 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sql/sql_select.cc
View File

@ -1584,8 +1584,7 @@ mysql_select(THD *thd, Item ***rref_pointer_array,
if (select_lex->linkage != GLOBAL_OPTIONS_TYPE)
{
//here is EXPLAIN of subselect or derived table
join->result= result;
if (!join->procedure && result->prepare(join->fields_list, unit))
if (join->change_result(result))
{
DBUG_RETURN(-1);
}
@ -9385,7 +9384,7 @@ void st_select_lex::print(THD *thd, String *str)
if (!thd->lex->safe_to_cache_query)
str->append("sql_no_cache ", 13);
if (options & OPTION_TO_QUERY_CACHE)
str->append("cache ", 6);
str->append("sql_cache ", 10);
//Item List
bool first= 1;
@ -9513,3 +9512,27 @@ void st_select_lex::print(THD *thd, String *str)
// PROCEDURE unsupported here
}
/*
change select_result object of JOIN
SYNOPSIS
JOIN::change_result()
res new select_result object
RETURN
0 - OK
-1 - error
*/
int JOIN::change_result(select_result *res)
{
DBUG_ENTER("JOIN::change_result");
result= res;
if (!procedure && result->prepare(fields_list, select_lex->master_unit()))
{
DBUG_RETURN(-1);
}
DBUG_RETURN(0);
}