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

Browse Source
This commit is contained in:
Sergei Golubchik
2025-01-24 14:52:35 +01:00
parent 4431d5bf0b 7d930974c0
commit 2d56f340c4
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
unittest/libmariadb/connection.c
View File

@@ -2332,7 +2332,8 @@ static int test_conc505(MYSQL *my __attribute__((unused)))
return OK;
}
#if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL)
#if defined(HAVE_GNUTLS) && GNUTLS_VERSION_NUMBER >= 0x030700 || defined(HAVE_OPENSSL)
#define HAVE_test_conc748
static int test_conc748(MYSQL *my __attribute__((unused)))
{
MYSQL *mysql;
@@ -2416,7 +2417,7 @@ static int test_conc589(MYSQL *my)
struct my_tests_st my_tests[] = {
{"test_conc589", test_conc589, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
#if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL)
#ifdef HAVE_test_conc748
{"test_conc748", test_conc748, TEST_CONNECTION_NONE, 0, NULL, NULL},
#endif
{"test_conc505", test_conc505, TEST_CONNECTION_NONE, 0, NULL, NULL},