database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00
Code Activity

CONC-141: set stmt->state to MYSQL_STMT_FETCH_DONE if no more resultsets

Browse Source 
are available
This commit is contained in:
Georg Richter
2015-09-17 08:14:13 +02:00
parent bc4a8284d1
commit b950d2cf48
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmariadb/my_stmt.c
View File

@@ -1887,6 +1887,7 @@ int STDCALL mysql_stmt_next_result(MYSQL_STMT *stmt)
if (mysql_next_result(stmt->mysql)) if (mysql_next_result(stmt->mysql))
{ {
stmt->state= MYSQL_STMT_FETCH_DONE;
SET_CLIENT_STMT_ERROR(stmt, stmt->mysql->net.last_errno, stmt->mysql->net.sqlstate, SET_CLIENT_STMT_ERROR(stmt, stmt->mysql->net.last_errno, stmt->mysql->net.sqlstate,
stmt->mysql->net.last_error); stmt->mysql->net.last_error);
DBUG_RETURN(1); DBUG_RETURN(1);

39
unittest/libmariadb/ps_bugs.c
View File

@@ -3868,7 +3868,46 @@ static int test_conc_5(MYSQL *mysql)
return OK; return OK;
} }
static int test_conc141(MYSQL *mysql)
{
int rc;
MYSQL_RES *res;
char *query= "CALL p_conc141";
MYSQL_STMT *stmt= mysql_stmt_init(mysql);
rc= mysql_query(mysql, "DROP TABLE IF EXISTS conc141");
check_mysql_rc(rc, mysql);
rc= mysql_query(mysql, "CREATE TABLE conc141 (KeyVal int not null primary key)");
check_mysql_rc(rc, mysql);
rc= mysql_query(mysql, "INSERT INTO conc141 VALUES(1)");
check_mysql_rc(rc, mysql);
rc= mysql_query(mysql, "DROP PROCEDURE IF EXISTS p_conc141");
check_mysql_rc(rc, mysql);
rc= mysql_query(mysql, "CREATE PROCEDURE p_conc141()\n"
"BEGIN\n"
"select * from conc141;\n"
"insert into conc141(KeyVal) VALUES(1);\n"
"END");
check_mysql_rc(rc, mysql);
rc= mysql_stmt_prepare(stmt, query, strlen(query));
check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
/* skip first result */
rc= mysql_stmt_next_result(stmt);
FAIL_IF(rc==-1, "No more results and error expected");
mysql_stmt_free_result(stmt);
FAIL_IF(mysql_stmt_errno(stmt), "No Error expected");
rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt);
mysql_stmt_close(stmt);
return OK;
}
struct my_tests_st my_tests[] = { struct my_tests_st my_tests[] = {
{"test_conc141", test_conc141, TEST_CONNECTION_NEW, 0, NULL , NULL},
{"test_conc67", test_conc67, TEST_CONNECTION_DEFAULT, 0, NULL , NULL}, {"test_conc67", test_conc67, TEST_CONNECTION_DEFAULT, 0, NULL , NULL},
{"test_conc_5", test_conc_5, TEST_CONNECTION_DEFAULT, 0, NULL , NULL}, {"test_conc_5", test_conc_5, TEST_CONNECTION_DEFAULT, 0, NULL , NULL},
{"test_bug1115", test_bug1115, TEST_CONNECTION_DEFAULT, 0, NULL , NULL}, {"test_bug1115", test_bug1115, TEST_CONNECTION_DEFAULT, 0, NULL , NULL},