1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam

This commit is contained in:
Marc Alff
2008-07-14 19:43:12 -06:00
16 changed files with 863 additions and 117 deletions

View File

@@ -3767,7 +3767,7 @@ bool mysql_unpack_partition(THD *thd,
thd->lex= &lex;
thd->variables.character_set_client= system_charset_info;
Lex_input_stream lip(thd, part_buf, part_info_len);
Parser_state parser_state(thd, part_buf, part_info_len);
lex_start(thd);
*work_part_info_used= false;
@@ -3797,7 +3797,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 (parse_sql(thd, &lip, NULL))
if (parse_sql(thd, & parser_state, NULL))
{
thd->free_items();
goto end;