1
0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00

CONC-667: Fix statement handling when unbuffered results are pending.

Resetting a statement will result in an error, if another (different)
statement has a pending unbuffered result set (CR_COMMANDS_OUT_OF_SYNC).

Freeing a statement result set will return an error, if the statement
has no result set or was not executed (CR_STMT_NO_RESULT).
This commit is contained in:
Georg Richter
2024-03-23 12:27:55 +01:00
parent 4a1c5ef53b
commit b64282a9dd
4 changed files with 64 additions and 2 deletions

View File

@@ -5741,7 +5741,47 @@ end:
return ret;
}
static int test_conc667(MYSQL *mysql)
{
MYSQL_STMT *stmt1, *stmt2;
int rc;
stmt1= mysql_stmt_init(mysql);
stmt2= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt1, "SELECT 1", -1);
check_stmt_rc(rc, stmt1);
rc= mysql_stmt_prepare(stmt2, "SELECT 2", -1);
check_stmt_rc(rc, stmt2);
rc= mysql_stmt_execute(stmt1);
check_stmt_rc(rc, stmt1);
rc= mysql_stmt_free_result(stmt2);
FAIL_IF(!rc || mysql_stmt_errno(stmt2) != CR_STMT_NO_RESULT,
"Expected CR_STMT_NO_RESULT");
diag("Error (expected) %s", mysql_stmt_error(stmt2));
rc= mysql_stmt_reset(stmt2);
FAIL_IF(!rc || mysql_stmt_errno(stmt2) != CR_COMMANDS_OUT_OF_SYNC,
"Expected commands out of sync error");
rc= mysql_stmt_fetch(stmt1);
check_stmt_rc(rc, stmt1);
mysql_stmt_free_result(stmt1);
rc= mysql_stmt_close(stmt1);
check_stmt_rc(rc, stmt1);
rc= mysql_stmt_close(stmt2);
check_stmt_rc(rc, stmt2);
return OK;
}
struct my_tests_st my_tests[] = {
{"test_conc667", test_conc667, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_conc633", test_conc633, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_conc623", test_conc623, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_conc627", test_conc627, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},