Skip to content

M
mariadb
Commit f6a0408a authored by unknown's avatar unknown
Browse files
Options

Bug #13040: Merge error causing partition error 


sql/sql_prepare.cc:
  Merge error
parent 55fdf322
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
sql/sql_prepare.cc
View file @ f6a0408a
...@@ -2686,11 +2686,11 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len) ...@@ -2686,11 +2686,11 @@ bool Prepared_statement::prepare(const char *packet, uint packet_len)
old_stmt_arena= thd->stmt_arena; old_stmt_arena= thd->stmt_arena;
thd->stmt_arena= this; thd->stmt_arena= this;
lex_start(thd, (uchar*) thd->query, thd->query_length); lex_start(thd, (uchar*) thd->query, thd->query_length);
lex->safe_to_cache_query= FALSE;
lex->stmt_prepare_mode= TRUE; lex->stmt_prepare_mode= TRUE;
rc= yyparse((void *)thd) || thd->is_fatal_error || rc= yyparse((void *)thd) || thd->is_fatal_error ||
thd->net.report_error || init_param_array(this); thd->net.report_error || init_param_array(this);
lex->safe_to_cache_query= FALSE;
/* /*
While doing context analysis of the query (in check_prepared_statement) While doing context analysis of the query (in check_prepared_statement)
we allocate a lot of additional memory: for open tables, JOINs, derived we allocate a lot of additional memory: for open tables, JOINs, derived
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7