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

Merge commit '8823607e299d6028df87d3c389a44ca004311de5' into 3.1

Browse Source
This commit is contained in:
Georg Richter
2019-06-30 17:34:04 +02:00
parent 86a9e07feb 8823607e29
commit 8c6c5e07ca
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libmariadb/mariadb_stmt.c
View File

@@ -1756,8 +1756,10 @@ int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt)
if (stmt->mysql->methods->db_command(stmt->mysql, COM_STMT_FETCH, if (stmt->mysql->methods->db_command(stmt->mysql, COM_STMT_FETCH,
buff, sizeof(buff), 1, stmt)) buff, sizeof(buff), 1, stmt))
{
UPDATE_STMT_ERROR(stmt);
return(1); return(1);
/* todo: cursor */ }
} }
else if (stmt->mysql->status != MYSQL_STATUS_STMT_RESULT) else if (stmt->mysql->status != MYSQL_STATUS_STMT_RESULT)
{ {
@@ -1931,8 +1933,8 @@ int stmt_read_execute_response(MYSQL_STMT *stmt)
} }
} }
if ((stmt->upsert_status.server_status & SERVER_STATUS_CURSOR_EXISTS) && if ((stmt->upsert_status.server_status & SERVER_STATUS_CURSOR_EXISTS) &&
(stmt->flags & CURSOR_TYPE_READ_ONLY)) (stmt->flags & CURSOR_TYPE_READ_ONLY))
{ {
stmt->cursor_exists = TRUE; stmt->cursor_exists = TRUE;
mysql->status = MYSQL_STATUS_READY; mysql->status = MYSQL_STATUS_READY;