mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making the latest fix for Bug#6166 (key.test) work in prepared statements.

Browse source 
sql/sql_prepare.cc:
  Catch another class of errors possible during yyparse:
  if thd->net.report_error is set, we need to send the message and 
  abort.
This commit is contained in:
unknown 2004-10-28 02:54:32 +04:00
parent fbabd08534
commit b97048498a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sql/sql_prepare.cc
View file

@ -1609,7 +1609,7 @@ int mysql_stmt_prepare(THD *thd, char *packet, uint packet_length,
lex->safe_to_cache_query= 0;
error= yyparse((void *)thd) || thd->is_fatal_error ||
init_param_array(stmt);
thd->net.report_error || init_param_array(stmt);
/*
While doing context analysis of the query (in send_prepare_results) we
allocate a lot of additional memory: for open tables, JOINs, derived
@ -1640,7 +1640,9 @@ int mysql_stmt_prepare(THD *thd, char *packet, uint packet_length,
/* Statement map deletes statement on erase */
thd->stmt_map.erase(stmt);
stmt= NULL;
/* error is sent inside yyparse/send_prepare_results */
if (thd->net.report_error)
send_error(thd);
/* otherwise the error is sent inside yyparse/send_prepare_results */
}
else
{