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 remote-tracking branch 'origin/3.1' into 3.4

Browse Source
This commit is contained in:
Georg Richter
2024-04-29 11:15:02 +02:00
parent 20fbb3c3b9 dab59732d9
commit 45179cffc4
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmariadb/ma_default.c
View File

@@ -135,6 +135,7 @@ char **get_default_configuration_dirs()
end:
return configuration_dirs;
error:
release_configuration_dirs();
return NULL;
}

4
unittest/libmariadb/bulk1.c
View File

@@ -83,8 +83,8 @@ static int bulk1(MYSQL *mysql)
/* allocate memory */
buffer= calloc(TEST_ARRAY_SIZE, sizeof(char *));
lengths= (unsigned long *)calloc(sizeof(long), TEST_ARRAY_SIZE);
vals= (unsigned int *)calloc(sizeof(int), TEST_ARRAY_SIZE);
lengths= calloc(TEST_ARRAY_SIZE, sizeof *lengths);
vals= calloc(TEST_ARRAY_SIZE, sizeof *vals);
for (i=0; i < TEST_ARRAY_SIZE; i++)
{

2
unittest/libmariadb/ps_bugs.c
View File

@@ -5159,7 +5159,7 @@ static int test_maxparam(MYSQL *mysql)
MYSQL_STMT *stmt= mysql_stmt_init(mysql);
MYSQL_BIND* bind;
bind = calloc(sizeof(MYSQL_BIND), 65535);
bind = calloc(65535, sizeof *bind);
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
check_mysql_rc(rc, mysql);