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.3' into 3.4

Browse Source
This commit is contained in:
Sergei Golubchik
2025-01-25 18:06:27 +01:00
parent 1135b92dd0 2d56f340c4
commit a99205eb36
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
unittest/libmariadb/connection.c
View File

@@ -2410,7 +2410,8 @@ int test_tls_timeout(MYSQL *unused __attribute__((unused)))
}
#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;
@@ -2496,7 +2497,7 @@ struct my_tests_st my_tests[] = {
{"test_conc589", test_conc589, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_tls_timeout", test_tls_timeout, TEST_CONNECTION_NONE, 0, NULL, NULL},
{"test_parsec", test_parsec, 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},