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

Windows build fixes:

Browse Source 
disable conc-317 for windows platforms
This commit is contained in:
Georg Richter
2018-04-14 07:30:19 +02:00
parent b2e6ed0295
commit 1b95733b57
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
unittest/libmariadb/connection.c
View File

@@ -1366,16 +1366,16 @@ static int test_conc315(MYSQL *mysql)
if (!is_mariadb) if (!is_mariadb)
return SKIP; return SKIP;
mysql_get_optionv(mysql, MYSQL_SET_CHARSET_NAME, &csname); mysql_get_optionv(mysql, MYSQL_SET_CHARSET_NAME, (void *)&csname);
FAIL_UNLESS(strcmp(csname, "utf8") == 0, "Wrong default character set"); FAIL_UNLESS(strcmp(csname, "utf8") == 0, "Wrong default character set");
rc= mysql_change_user(mysql, username, password, schema); rc= mysql_change_user(mysql, username, password, schema);
check_mysql_rc(rc, mysql); check_mysql_rc(rc, mysql);
mysql_get_optionv(mysql, MYSQL_SET_CHARSET_NAME, &csname); mysql_get_optionv(mysql, MYSQL_SET_CHARSET_NAME, (void *)&csname);
FAIL_UNLESS(strcmp(csname, "utf8") == 0, "Wrong default character set"); FAIL_UNLESS(strcmp(csname, "utf8") == 0, "Wrong default character set");
return OK; return OK;
} }
#ifndef WIN32
static int test_conc317(MYSQL *unused __attribute__((unused))) static int test_conc317(MYSQL *unused __attribute__((unused)))
{ {
MYSQL *mysql; MYSQL *mysql;
@@ -1415,9 +1415,12 @@ static int test_conc317(MYSQL *unused __attribute__((unused)))
mysql_close(mysql); mysql_close(mysql);
return OK; return OK;
} }
#endif
struct my_tests_st my_tests[] = { struct my_tests_st my_tests[] = {
#ifndef WIN32
{"test_conc317", test_conc317, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, {"test_conc317", test_conc317, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
#endif
{"test_conc315", test_conc315, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, {"test_conc315", test_conc315, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_expired_pw", test_expired_pw, TEST_CONNECTION_DEFAULT, 0, NULL, NULL}, {"test_expired_pw", test_expired_pw, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_conc276", test_conc276, TEST_CONNECTION_NONE, 0, NULL, NULL}, {"test_conc276", test_conc276, TEST_CONNECTION_NONE, 0, NULL, NULL},