1
0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-07 02:42:49 +03:00

Merg 3.1 into 3.3

This commit is contained in:
Marko Mäkelä
2024-04-11 14:54:08 +03:00
2 changed files with 3 additions and 3 deletions

View File

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

View File

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