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 3.1 into 3.2

Browse Source
This commit is contained in:
Marko Mäkelä
2021-02-16 18:44:15 +02:00
parent 3cf45a2c57 7d304d26c7
commit 375bab0d51
43 changed files with 891 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libmariadb/mariadb_stmt.c
View File

@@ -2199,8 +2199,11 @@ static my_bool mysql_stmt_internal_reset(MYSQL_STMT *stmt, my_bool is_close)
}
if (!is_close)
ret= madb_reset_stmt(stmt, MADB_RESET_SERVER);
stmt->state= MYSQL_STMT_PREPARED;
}
stmt->state= MYSQL_STMT_PREPARED;
else
stmt->state= MYSQL_STMT_INITTED;
stmt->upsert_status.affected_rows= mysql->affected_rows;
stmt->upsert_status.last_insert_id= mysql->insert_id;
stmt->upsert_status.server_status= mysql->server_status;