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 commit 'd4a0a384459e3a6645ad4df46db18a5d2dd4c780' into 3.1

Browse Source
This commit is contained in:
Georg Richter
2019-06-14 13:36:07 +02:00
parent d95dec811a d4a0a38445
commit 8983406ade
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmariadb/secure/schannel.c
View File

@@ -545,13 +545,11 @@ const char *ma_tls_get_cipher(MARIADB_TLS *ctls)
SecPkgContext_CipherInfo CipherInfo = { SECPKGCONTEXT_CIPHERINFO_V1 }; SecPkgContext_CipherInfo CipherInfo = { SECPKGCONTEXT_CIPHERINFO_V1 };
SECURITY_STATUS sRet; SECURITY_STATUS sRet;
SC_CTX *sctx; SC_CTX *sctx;
SecPkgContext_ConnectionInfo ci;
if (!ctls || !ctls->ssl) if (!ctls || !ctls->ssl)
return NULL; return NULL;
sctx= (SC_CTX *)ctls->ssl; sctx= (SC_CTX *)ctls->ssl;
sRet = QueryContextAttributesA(&sctx->ctxt, SECPKG_ATTR_CONNECTION_INFO, (PVOID)&ci);
sRet= QueryContextAttributesA(&sctx->ctxt, SECPKG_ATTR_CIPHER_INFO, (PVOID)&CipherInfo); sRet= QueryContextAttributesA(&sctx->ctxt, SECPKG_ATTR_CIPHER_INFO, (PVOID)&CipherInfo);
if (sRet != SEC_E_OK) if (sRet != SEC_E_OK)

12
unittest/libmariadb/ps_bugs.c
View File

@@ -4275,13 +4275,7 @@ static int test_conc179(MYSQL *mysql)
{ {
MYSQL_STMT *stmt; MYSQL_STMT *stmt;
int rc; int rc;
const char *stmtstr= "CREATE TABLE t1 (`blurb_id` int NOT NULL DEFAULT 0, `blurb` text default '', PRIMARY KEY (blurb_id)) ENGINE='FEDERATED' DEFAULT CHARSET=latin1 CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/test/t1'"; const char *stmtstr= "select 1 as ' '";
rc= mysql_query(mysql, "set sql_mode=''");
check_mysql_rc(rc, mysql);
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
check_mysql_rc(rc, mysql);
stmt= mysql_stmt_init(mysql); stmt= mysql_stmt_init(mysql);
rc= mysql_stmt_prepare(stmt, SL(stmtstr)); rc= mysql_stmt_prepare(stmt, SL(stmtstr));
@@ -4289,8 +4283,8 @@ static int test_conc179(MYSQL *mysql)
if (mysql_get_server_version(mysql) >= 100100) if (mysql_get_server_version(mysql) >= 100100)
{ {
FAIL_IF(mysql_warning_count(mysql) < 2, "expected 2 or more warnings"); FAIL_IF(mysql_warning_count(mysql) < 1, "expected 1 or more warnings");
FAIL_IF(mysql_stmt_warning_count(stmt) < 2, "expected 2 or more warnings"); FAIL_IF(mysql_stmt_warning_count(stmt) < 1, "expected 1 or more warnings");
} }
mysql_stmt_close(stmt); mysql_stmt_close(stmt);