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

Merge 3.1 into 3.2

Browse Source
This commit is contained in:
Marko Mäkelä
2021-08-31 10:28:30 +03:00
parent 5e11dab91a d72b85c396
commit fc25d79083
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmariadb/secure/ma_schannel.c
View File

@@ -96,7 +96,7 @@ SECURITY_STATUS ma_schannel_handshake_loop(MARIADB_PVIO *pvio, my_bool InitialRe
/* Allocate data buffer */ /* Allocate data buffer */
if (!(IoBuffer = LocalAlloc(LMEM_FIXED, SC_IO_BUFFER_SIZE))) if (!(IoBuffer = malloc(SC_IO_BUFFER_SIZE)))
return SEC_E_INSUFFICIENT_MEMORY; return SEC_E_INSUFFICIENT_MEMORY;
cbIoBuffer = 0; cbIoBuffer = 0;
@@ -245,7 +245,7 @@ loopend:
ma_schannel_set_sec_error(pvio, rc); ma_schannel_set_sec_error(pvio, rc);
DeleteSecurityContext(&sctx->hCtxt); DeleteSecurityContext(&sctx->hCtxt);
} }
LocalFree(IoBuffer); free(IoBuffer);
return rc; return rc;
} }

8
unittest/libmariadb/cursor.c
View File

@@ -210,12 +210,6 @@ int fetch_n(MYSQL *mysql, const char **query_list, unsigned query_count,
} }
} }
} }
if (!error_count)
{
unsigned total_row_count= 0;
for (fetch= fetch_array; fetch < fetch_array + query_count; ++fetch)
total_row_count+= fetch->row_count;
}
for (fetch= fetch_array; fetch < fetch_array + query_count; ++fetch) for (fetch= fetch_array; fetch < fetch_array + query_count; ++fetch)
stmt_fetch_close(fetch); stmt_fetch_close(fetch);
free(fetch_array); free(fetch_array);
@@ -1505,6 +1499,8 @@ static int test_bug38486(MYSQL *mysql)
check_stmt_rc(rc, stmt); check_stmt_rc(rc, stmt);
rc= mysql_stmt_execute(stmt); rc= mysql_stmt_execute(stmt);
check_stmt_rc(rc, stmt); check_stmt_rc(rc, stmt);
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t10");
check_mysql_rc(rc, mysql);
mysql_stmt_close(stmt); mysql_stmt_close(stmt);
rc= mysql_query(mysql, "DROP TABLE t10"); rc= mysql_query(mysql, "DROP TABLE t10");