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 branch '3.0' into 3.1

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-07-18 13:51:03 +02:00
parent b396e76833 0c20765baf
commit 5fa9c4615e
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/auth/caching_sha2_pw.c
View File

@@ -23,6 +23,9 @@
#ifdef _WIN32 #ifdef _WIN32
#if !defined(HAVE_OPENSSL) #if !defined(HAVE_OPENSSL)
#define HAVE_WINCRYPT #define HAVE_WINCRYPT
#else
#pragma comment(lib, "crypt32.lib")
#pragma comment(lib, "ws2_32.lib")
#endif #endif
#endif #endif

3
plugins/auth/sha256_pw.c
View File

@@ -23,6 +23,9 @@
#ifdef _WIN32 #ifdef _WIN32
#if !defined(HAVE_OPENSSL) #if !defined(HAVE_OPENSSL)
#define HAVE_WINCRYPT #define HAVE_WINCRYPT
#else
#pragma comment(lib, "crypt32.lib")
#pragma comment(lib, "ws2_32.lib")
#endif #endif
#endif #endif

1
unittest/libmariadb/ps_bugs.c
View File

@@ -5102,6 +5102,7 @@ static int test_conc424(MYSQL *mysql)
} while (!rc); } while (!rc);
mysql_stmt_close(stmt);
rc= mysql_query(mysql, "DROP PROCEDURE testCursor"); rc= mysql_query(mysql, "DROP PROCEDURE testCursor");
check_mysql_rc(rc, mysql); check_mysql_rc(rc, mysql);