mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
The second cleanup patch in scope of BUG#11986.
1. Introduce parse_sql() as a high-level replacement for MYSQLparse(). parse_sql() is responsible to switch and restore "parser context" (THD::m_lip for now). 2. Fix typo in sp.cc: THD::spcont should be reset *before* calling the parser.
This commit is contained in:
@ -3696,7 +3696,6 @@ bool mysql_unpack_partition(THD *thd,
|
||||
thd->variables.character_set_client= system_charset_info;
|
||||
|
||||
Lex_input_stream lip(thd, part_buf, part_info_len);
|
||||
thd->m_lip= &lip;
|
||||
|
||||
lex_start(thd);
|
||||
/*
|
||||
@ -3725,7 +3724,7 @@ bool mysql_unpack_partition(THD *thd,
|
||||
lex.part_info->part_state= part_state;
|
||||
lex.part_info->part_state_len= part_state_len;
|
||||
DBUG_PRINT("info", ("Parse: %s", part_buf));
|
||||
if (MYSQLparse((void*)thd) || thd->is_fatal_error)
|
||||
if (parse_sql(thd, &lip))
|
||||
{
|
||||
thd->free_items();
|
||||
goto end;
|
||||
|
Reference in New Issue
Block a user