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

MDEV-6400: "ANALYZE SELECT ... INTO @var" doesn't set @var

Browse Source 
Make ANALYZE work for
- ANALYZE SELECT ... INTO @var
- ANALYZE INSERT SELECT ...;
- ANALYZE SELECT .. INTO OUTFILE
This commit is contained in:
Sergei Petrunia
2014-10-17 14:18:10 +04:00
parent fec5ab5a56
commit d44dd54bc8
6 changed files with 82 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sql/sql_parse.cc
View File

@ -3814,6 +3814,9 @@ end_with_restore_list:
lex->duplicates,
lex->ignore)))
{
if (lex->analyze_stmt)
((select_result_interceptor*)sel_result)->disable_my_ok_calls();
res= handle_select(thd, lex, sel_result, OPTION_SETUP_TABLES_DONE);
/*
Invalidate the table in the query cache if something changed
@ -3833,7 +3836,7 @@ end_with_restore_list:
delete sel_result;
}
if (!res && explain)
if (!res && (explain || lex->analyze_stmt))
res= thd->lex->explain->send_explain(thd);
/* revert changes for SP */
@ -5649,12 +5652,18 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
}
else
{
Protocol *save_protocol;
Protocol *save_protocol= NULL;
if (lex->analyze_stmt)
{
result= new select_send_analyze();
save_protocol= thd->protocol;
thd->protocol= new Protocol_discard(thd);
if (result && result->is_result_interceptor())
((select_result_interceptor*)result)->disable_my_ok_calls();
else
{
DBUG_ASSERT(thd->protocol);
result= new select_send_analyze();
save_protocol= thd->protocol;
thd->protocol= new Protocol_discard(thd);
}
}
else
{
@ -5668,8 +5677,11 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
if (lex->analyze_stmt)
{
delete thd->protocol;
thd->protocol= save_protocol;
if (save_protocol)
{
delete thd->protocol;
thd->protocol= save_protocol;
}
if (!res)
res= thd->lex->explain->send_explain(thd);
}