summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2010-03-11 16:47:34 +0300
committerKonstantin Osipov <kostja@sun.com>2010-03-11 16:47:34 +0300
commitea70b6a20a7fe27bdfe5ed0a828cdddf72b8a5d2 (patch)
treedff45833e872a01ba6555a085f891ee5ccacca1b /tests
parentbaab8dd83cc14a4bee8a16c6180f46014181e8a8 (diff)
downloadmariadb-git-ea70b6a20a7fe27bdfe5ed0a828cdddf72b8a5d2.tar.gz
A fix for Bug#49972 "Crash in prepared statements":
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.
Diffstat (limited to 'tests')
-rw-r--r--tests/mysql_client_test.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 8f4c44e2c82..8112a2a3c0d 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -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 }
};