database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-4603 mysql_stmt_reset returns "commands out of sync" error

Browse Source
This commit is contained in:
unknown
2014-03-06 11:47:22 +01:00
committed by Sergei Golubchik
parent 4c788b06d4
commit ae87e63184
2 changed files with 120 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
tests/mysql_client_test.c
View File

@ -18749,6 +18749,109 @@ static void test_bug12337762()
DBUG_VOID_RETURN;
}
/*
MDEV-4603: mysql_stmt_reset doesn't clear
all result sets (from stored procedures).
This test requires also fix for MDEV-4604
*/
static void test_mdev4603()
{
MYSQL *my;
MYSQL_STMT *stmt;
int i, rc;
int a[] = {10,20,30};
MYSQL_BIND bind[3];
myheader("test_mdev4603");
my= mysql_client_init(NULL);
if (!mysql_real_connect(my, opt_host, opt_user,
opt_password, current_db, opt_port,
opt_unix_socket, CLIENT_MULTI_RESULTS))
DIE("mysql_real_connect failed");
/* 1st test:
use a procedure with out param
*/
rc= mysql_query(my, "DROP PROCEDURE IF EXISTS p1");
myquery(rc);
rc= mysql_query(mysql, "CREATE PROCEDURE p1(OUT p_out VARCHAR(19), IN p_in INT, INOUT p_inout INT)"
"BEGIN "
" SET p_in = 300, p_out := 'This is OUT param', p_inout = 200; "
" SELECT p_inout, p_in, substring(p_out, 9);"
"END");
myquery(rc);
stmt= mysql_stmt_init(mysql);
DIE_UNLESS(stmt != NULL);
rc= mysql_stmt_prepare(stmt, "CALL P1(?,?,?)", 14);
DIE_UNLESS(rc == 0);
DIE_UNLESS(mysql_stmt_param_count(stmt) == 3);
memset(bind, 0, sizeof(MYSQL_BIND) * 3);
for (i=0; i < 3; i++)
{
bind[i].buffer= &a[i];
bind[i].buffer_type= MYSQL_TYPE_LONG;
}
bind[0].buffer_type= MYSQL_TYPE_NULL;
rc= mysql_stmt_bind_param(stmt, bind);
DIE_UNLESS(rc == 0);
rc= mysql_stmt_execute(stmt);
DIE_UNLESS(rc == 0);
rc= mysql_stmt_fetch(stmt);
DIE_UNLESS(rc == 0);
rc= mysql_stmt_reset(stmt);
DIE_UNLESS(rc == 0);
/*connection shouldn't be blocked now */
rc= mysql_query(mysql, "DROP PROCEDURE p1");
myquery(rc);
/* 2nd test:
reset all result sets */
rc= mysql_query(my, "CREATE PROCEDURE p1() "
"BEGIN"
" SELECT 1,2,3 FROM DUAL;"
" SELECT 'foo' FROM DUAL;"
"END");
myquery(rc);
rc= mysql_stmt_prepare(stmt, "CALL P1()", 9);
DIE_UNLESS(rc == 0);
rc= mysql_stmt_execute(stmt);
DIE_UNLESS(rc == 0);
rc= mysql_stmt_reset(stmt);
DIE_UNLESS(rc == 0);
/* 3rd test:
mysql_stmt_close should also flush all pending
result sets
*/
rc= mysql_stmt_prepare(stmt, "CALL P1()", 9);
DIE_UNLESS(rc == 0);
rc= mysql_stmt_execute(stmt);
DIE_UNLESS(rc == 0);
rc= mysql_stmt_close(stmt);
DIE_UNLESS(rc == 0);
rc= mysql_query(my, "DROP PROCEDURE p1");
myquery(rc);
mysql_close(my);
}
/*
BUG 11754979 - 46675: ON DUPLICATE KEY UPDATE AND UPDATECOUNT() POSSIBLY WRONG
@ -19289,6 +19392,7 @@ static struct my_tests_st my_tests[]= {
{ "test_bug57058", test_bug57058 },
{ "test_bug56976", test_bug56976 },
{ "test_mdev3885", test_mdev3885 },
{ "test_mdev4603", test_mdev4603 },
{ "test_bug11766854", test_bug11766854 },
{ "test_bug12337762", test_bug12337762 },
{ "test_progress_reporting", test_progress_reporting },