diff options
Diffstat (limited to 'libmariadb/unittest')
-rw-r--r-- | libmariadb/unittest/libmariadb/bulk1.c | 4 | ||||
-rw-r--r-- | libmariadb/unittest/libmariadb/connection.c | 26 | ||||
-rw-r--r-- | libmariadb/unittest/libmariadb/ps_bugs.c | 4 |
3 files changed, 30 insertions, 4 deletions
diff --git a/libmariadb/unittest/libmariadb/bulk1.c b/libmariadb/unittest/libmariadb/bulk1.c index e1c31eaa..62267cd7 100644 --- a/libmariadb/unittest/libmariadb/bulk1.c +++ b/libmariadb/unittest/libmariadb/bulk1.c @@ -74,8 +74,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++) { diff --git a/libmariadb/unittest/libmariadb/connection.c b/libmariadb/unittest/libmariadb/connection.c index fa232cad..a10e01bd 100644 --- a/libmariadb/unittest/libmariadb/connection.c +++ b/libmariadb/unittest/libmariadb/connection.c @@ -2307,7 +2307,33 @@ static int test_conc632(MYSQL *my __attribute__((unused))) return OK; } +static int test_conc505(MYSQL *my __attribute__((unused))) +{ + MYSQL *mysql= mysql_init(NULL); + +#define CLIENT_DEPRECATE_EOF (1ULL << 24) + + if (my_test_connect(mysql, hostname, username, password, schema, port, socketname, CLIENT_DEPRECATE_EOF)) + { + diag("Error expected: Invalid client flag"); + mysql_close(mysql); + return FAIL; + } + diag("Error (expected): %s", mysql_error(mysql)); + FAIL_IF(mysql_errno(mysql) != CR_INVALID_CLIENT_FLAG, "Wrong error number"); + if (!my_test_connect(mysql, hostname, username, password, schema, port, socketname, CLIENT_MULTI_STATEMENTS | CLIENT_MULTI_RESULTS)) + { + diag("Error: %s", mysql_error(mysql)); + mysql_close(mysql); + return FAIL; + } + + mysql_close(mysql); + return OK; +} + struct my_tests_st my_tests[] = { + {"test_conc505", test_conc505, TEST_CONNECTION_NONE, 0, NULL, NULL}, {"test_conc632", test_conc632, TEST_CONNECTION_NONE, 0, NULL, NULL}, {"test_status_callback", test_status_callback, TEST_CONNECTION_NONE, 0, NULL, NULL}, {"test_conc365", test_conc365, TEST_CONNECTION_NONE, 0, NULL, NULL}, diff --git a/libmariadb/unittest/libmariadb/ps_bugs.c b/libmariadb/unittest/libmariadb/ps_bugs.c index efe3d447..72af30b4 100644 --- a/libmariadb/unittest/libmariadb/ps_bugs.c +++ b/libmariadb/unittest/libmariadb/ps_bugs.c @@ -3257,7 +3257,7 @@ error: static int test_mem_overun(MYSQL *mysql) { - char buffer[10000], field[12]; + char buffer[10000], field[20]; MYSQL_STMT *stmt; MYSQL_RES *field_res, *res; int rc, i, length; @@ -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); |