1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

A fix for Bug#49972 "Crash in prepared statements":

Browse Source 
The problem is introduced by WL#4435 "Support OUT-parameters in 
prepared statements".
When a statement that has out parameters was reprepared,
the reprepare request error was ignored, and an
attempt to send out parameters to the client was made.

Since the out parameter list was not initialized in case
of an error, this attempt led to a crash.

Don't try to send out parameters to the client
if an error occurred in statement execution.

sql/sql_prepare.cc:
  Don't try to send out parameters if error.
tests/mysql_client_test.c:
  Re-enable the test case for Bug#49972.
This commit is contained in:
Konstantin Osipov 2010-03-11 16:47:34 +03:00
parent baab8dd83c
commit ea70b6a20a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_prepare.cc
View File

@ -3769,7 +3769,7 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor)
if (state == Query_arena::PREPARED)
state= Query_arena::EXECUTED;
if (this->lex->sql_command == SQLCOM_CALL)
if (error == 0 && this->lex->sql_command == SQLCOM_CALL)
{
if (is_sql_prepare())
thd->protocol_text.send_out_parameters(&this->lex->param_list);
@ -3777,7 +3777,6 @@ bool Prepared_statement::execute(String *expanded_query, bool open_cursor)
thd->protocol->send_out_parameters(&this->lex->param_list);
}
/*
Log COM_EXECUTE to the general log. Note, that in case of SQL
prepared statements this causes two records to be output:

2
tests/mysql_client_test.c
View File

@ -19373,7 +19373,7 @@ static struct my_tests_st my_tests[]= {
#endif
{ "test_bug41078", test_bug41078 },
{ "test_bug44495", test_bug44495 },
/* XXX { "test_bug49972", test_bug49972 }, */
{ "test_bug49972", test_bug49972 },
{ 0, 0 }
};