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

Bug#15463: EXPLAIN SELECT..INTO hangs the client (QB, command line)

Browse Source 
There were two distict bugs: parse error was returned for valid
statement and that error wasn't reported to the client.

The fix ensures that EXPLAIN SELECT..INTO is accepted by parser and any
other parse error will be reported to the client.
This commit is contained in:
kroki@mysql.com
2006-05-03 18:02:43 +04:00
parent c40f8557dc
commit 96f0aa3cfb
4 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/explain.result
View File

@ -53,3 +53,7 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE <09><><EFBFBD> ref <09><><EFBFBD>0,<2C><><EFBFBD>01 <09><><EFBFBD>0 5 const 1 Using where; Using index 1 SIMPLE <09><><EFBFBD> ref <09><><EFBFBD>0,<2C><><EFBFBD>01 <09><><EFBFBD>0 5 const 1 Using where; Using index
drop table <20><><EFBFBD>; drop table <20><><EFBFBD>;
set names latin1; set names latin1;
select 3 into @v1;
explain select 3 into @v1;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE NULL NULL NULL NULL NULL NULL NULL No tables used

9
mysql-test/t/explain.test
View File

@ -43,3 +43,12 @@ drop table
set names latin1; set names latin1;
# End of 4.1 tests # End of 4.1 tests
#
# Bug#15463: EXPLAIN SELECT..INTO hangs the client (QB, command line)
#
select 3 into @v1;
explain select 3 into @v1;
# End of 5.0 tests.

1
sql/sql_parse.cc
View File

@ -5709,6 +5709,7 @@ void mysql_parse(THD *thd, char *inBuf, uint length)
} }
else else
{ {
DBUG_ASSERT(thd->net.report_error);
DBUG_PRINT("info",("Command aborted. Fatal_error: %d", DBUG_PRINT("info",("Command aborted. Fatal_error: %d",
thd->is_fatal_error)); thd->is_fatal_error));
query_cache_abort(&thd->net); query_cache_abort(&thd->net);

18
sql/sql_yacc.yy
View File

@ -5795,7 +5795,11 @@ select_var_ident:
if (lex->result) if (lex->result)
((select_dumpvar *)lex->result)->var_list.push_back( new my_var($2,0,0,(enum_field_types)0)); ((select_dumpvar *)lex->result)->var_list.push_back( new my_var($2,0,0,(enum_field_types)0));
else else
YYABORT; /*
The parser won't create select_result instance only
if it's an EXPLAIN.
*/
DBUG_ASSERT(lex->describe);
} }
| ident_or_text | ident_or_text
{ {
@ -5807,9 +5811,7 @@ select_var_ident:
my_error(ER_SP_UNDECLARED_VAR, MYF(0), $1.str); my_error(ER_SP_UNDECLARED_VAR, MYF(0), $1.str);
YYABORT; YYABORT;
} }
if (! lex->result) if (lex->result)
YYABORT;
else
{ {
my_var *var; my_var *var;
((select_dumpvar *)lex->result)-> ((select_dumpvar *)lex->result)->
@ -5819,6 +5821,14 @@ select_var_ident:
var->sp= lex->sphead; var->sp= lex->sphead;
#endif #endif
} }
else
{
/*
The parser won't create select_result instance only
if it's an EXPLAIN.
*/
DBUG_ASSERT(lex->describe);
}
} }
; ;