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 branch '3.0' into 3.1

Browse Source
This commit is contained in:
Georg Richter
2019-03-03 14:03:20 +01:00
parent 4aad20db15 f24915057c
commit af47d1beab
5 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
unittest/libmariadb/connection.c
View File

@@ -1345,6 +1345,10 @@ static int test_expired_pw(MYSQL *my)
my_test_connect(mysql, hostname, "foo", "foo", schema,
port, socketname, 0);
/* we should be in sandbox mode now, only set commands should be allowed */
rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
FAIL_IF(!rc, "Error expected (we are in sandbox mode");
diag("error: %d %s", mysql_errno(mysql), mysql_error(mysql));
FAIL_IF(mysql_errno(mysql) != ER_MUST_CHANGE_PASSWORD &&
mysql_errno(mysql) != ER_MUST_CHANGE_PASSWORD_LOGIN, "Error 1820/1862 expected");
@@ -1610,6 +1614,13 @@ static int test_conc366(MYSQL *mysql)
return SKIP;
}
/* check if ed25519 plugin is available */
if (!mysql_client_find_plugin(mysql, "client_ed25519", 3))
{
diag("client_ed25519 plugin not available");
return SKIP;
}
rc= mysql_query(mysql, "INSTALL SONAME 'auth_ed25519'");
if (rc)
{
@@ -1639,13 +1650,40 @@ static int test_conc366(MYSQL *mysql)
sprintf(query, "UNINSTALL SONAME 'auth_ed25519'");
rc= mysql_query(mysql, query);
check_mysql_rc(rc, mysql);
return OK;
}
static int test_conc392(MYSQL *mysql)
{
int rc;
const char *data;
size_t len;
ulong capabilities= 0;
mariadb_get_infov(mysql, MARIADB_CONNECTION_SERVER_CAPABILITIES, &capabilities);
if (!(capabilities & CLIENT_SESSION_TRACKING))
{
diag("Server doesn't support session tracking (cap=%lu)", mysql->server_capabilities);
return SKIP;
}
rc= mysql_query(mysql, "set session_track_state_change=1");
check_mysql_rc(rc, mysql);
if (mysql_session_track_get_first(mysql, SESSION_TRACK_STATE_CHANGE, &data, &len))
{
diag("session_track_get_first failed");
return FAIL;
}
FAIL_IF(len != 1, "Expected length 1");
return OK;
}
struct my_tests_st my_tests[] = {
{"test_conc366", test_conc366, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_conc392", test_conc392, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_conc312", test_conc312, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_conc351", test_conc351, TEST_CONNECTION_NONE, 0, NULL, NULL},
{"test_conc332", test_conc332, TEST_CONNECTION_NONE, 0, NULL, NULL},

5
unittest/libmariadb/errors.c
View File

@@ -239,6 +239,7 @@ static int test_parse_error_and_bad_length(MYSQL *mysql)
{
MYSQL_STMT *stmt;
int rc;
char stmt_str[128];
/* check that we get 4 syntax errors over the 4 calls */
@@ -254,7 +255,9 @@ static int test_parse_error_and_bad_length(MYSQL *mysql)
mysql_stmt_close(stmt);
stmt= mysql_stmt_init(mysql);
FAIL_UNLESS(stmt, "");
rc= mysql_stmt_prepare(stmt, "SHOW DATABASES", 100);
memset(stmt_str, 0, 100);
strcpy(stmt_str, "SHOW DATABASES");
rc= mysql_stmt_prepare(stmt, stmt_str, 99);
FAIL_IF(!rc, "Error expected");
mysql_stmt_close(stmt);
return OK;