database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-05 15:55:58 +03:00
Code Activity

Merge branch '3.3' into 3.4

Browse Source
This commit is contained in:
Georg Richter
2025-02-18 16:35:55 +01:00
parent fe3a570810 c21a246b2d
commit eda920ec0f
4 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unittest/libmariadb/connection.c
View File

@@ -2423,6 +2423,7 @@ static int test_conc748(MYSQL *my __attribute__((unused)))
MYSQL *mysql;
int i;
const char *ciphers[3]= {"TLS_AES_128_GCM_SHA256", "TLS_AES_256_GCM_SHA384", "TLS_CHACHA20_POLY1305_SHA256"};
my_bool verify= 0;
SKIP_MAXSCALE;
@@ -2432,6 +2433,7 @@ static int test_conc748(MYSQL *my __attribute__((unused)))
mysql= mysql_init(NULL);
mysql_ssl_set(mysql, NULL, NULL, NULL, NULL, NULL);
mysql_optionsv(mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, &verify);
mysql_optionsv(mysql, MYSQL_OPT_SSL_CIPHER, ciphers[i]);
if (!my_test_connect(mysql, hostname, username,

1
unittest/libmariadb/errors.c
View File

@@ -287,6 +287,7 @@ static int test_mdev35935(MYSQL *mysql)
MYSQL_BIND bind[2];
const char *data= "test";
SKIP_MAXSCALE;
SKIP_MYSQL(mysql);
rc= mysql_select_db(mysql, schema);

7
unittest/libmariadb/ps_bugs.c
View File

@@ -5001,7 +5001,7 @@ static int test_conc_fraction(MYSQL *mysql)
for (i=0; i < 10; i++, frac=frac*10+i)
{
unsigned long expected= 0;
unsigned int expected= frac;
sprintf(query, "SELECT '2018-11-05 22:25:59.%ld'", frac);
diag("%d: %s", i, query);
@@ -5027,13 +5027,14 @@ static int test_conc_fraction(MYSQL *mysql)
diag("second_part: %ld", tm.second_part);
expected= frac * 100000;
while (expected && expected < 100000)
expected *= 10;
while (expected >= 1000000)
expected /= 10;
if (tm.second_part != expected)
{
diag("Error: tm.second_part=%ld expected=%ld", tm.second_part, expected);
diag("Error: tm.second_part=%ld expected=%d", tm.second_part, expected);
mysql_stmt_close(stmt);
return FAIL;
}