mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
Fixes for usage of sub-selects in KILL and HANDLER ....
Approved by Sanja ... ;o)
This commit is contained in:
parent
ac2aea8c4a
commit
e6b5a8a7f7
1 changed files with 12 additions and 0 deletions
|
@ -2562,6 +2562,12 @@ select_derived:
|
|||
{
|
||||
LEX *lex= Lex;
|
||||
lex->derived_tables= 1;
|
||||
if (((int)lex->sql_command >= (int)SQLCOM_HA_OPEN &&
|
||||
lex->sql_command <= (int)SQLCOM_HA_READ) || lex->sql_command == (int)SQLCOM_KILL)
|
||||
{
|
||||
send_error(lex->thd, ER_SYNTAX_ERROR);
|
||||
YYABORT;
|
||||
}
|
||||
if (lex->current_select->linkage == GLOBAL_OPTIONS_TYPE ||
|
||||
mysql_new_select(lex, 1))
|
||||
YYABORT;
|
||||
|
@ -4578,6 +4584,12 @@ in_subselect_init:
|
|||
subselect_start:
|
||||
'(' SELECT_SYM
|
||||
{
|
||||
LEX *lex=Lex;
|
||||
if (((int)lex->sql_command >= (int)SQLCOM_HA_OPEN &&
|
||||
lex->sql_command <= (int)SQLCOM_HA_READ) || lex->sql_command == (int)SQLCOM_KILL) {
|
||||
send_error(lex->thd, ER_SYNTAX_ERROR);
|
||||
YYABORT;
|
||||
}
|
||||
if (mysql_new_select(Lex, 1))
|
||||
YYABORT;
|
||||
};
|
||||
|
|
Loading…
Add table
Reference in a new issue