mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-27 18:55:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

System Versioning 1.0pre2

Browse source 
Merge branch '10.3' into trunk
This commit is contained in:
Aleksey Midenkov 2017-11-23 18:57:26 +03:00
commit 6e0b2c7fe0
104 changed files with 2568 additions and 5169 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/sql_tvc.cc
View file

@ -283,6 +283,9 @@ int table_value_constr::save_explain_data_intern(THD *thd,
explain= new (output->mem_root) Explain_select(output->mem_root,
thd->lex->analyze_stmt);
if (!explain)
DBUG_RETURN(1);
select_lex->set_explain_type(true);
explain->select_id= select_lex->select_number;
@ -309,7 +312,7 @@ int table_value_constr::save_explain_data_intern(THD *thd,
Optimization of TVC
*/
void table_value_constr::optimize(THD *thd)
bool table_value_constr::optimize(THD *thd)
{
create_explain_query_if_not_exists(thd->lex, thd->mem_root);
have_query_plan= QEP_AVAILABLE;
@ -320,8 +323,9 @@ void table_value_constr::optimize(THD *thd)
thd->lex->explain && // for "SET" command in SPs.
(!thd->lex->explain->get_select(select_lex->select_number)))
{
save_explain_data_intern(thd, thd->lex->explain);
return save_explain_data_intern(thd, thd->lex->explain);
}
return 0;
}