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

fix connection unit test to work in mtr

Browse Source
This commit is contained in:
Sergei Golubchik
2019-02-01 13:01:28 +01:00
parent 82355ad11d
commit a4effc462d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
unittest/libmariadb/connection.c
View File

@@ -1623,6 +1623,8 @@ static int test_conc366(MYSQL *mysql)
check_mysql_rc(rc, mysql); check_mysql_rc(rc, mysql);
my= mysql_init(NULL); my= mysql_init(NULL);
if (plugindir)
mysql_options(my, MYSQL_PLUGIN_DIR, plugindir);
if (!mysql_real_connect(my, hostname, "ede", "foo", schema, port, socketname, 0)) if (!mysql_real_connect(my, hostname, "ede", "foo", schema, port, socketname, 0))
{ {
diag("Error: %s", mysql_error(my)); diag("Error: %s", mysql_error(my));
@@ -1633,7 +1635,10 @@ static int test_conc366(MYSQL *mysql)
sprintf(query, "DROP USER 'ede'@'%s'", this_host); sprintf(query, "DROP USER 'ede'@'%s'", this_host);
rc= mysql_query(mysql, query); rc= mysql_query(mysql, query);
check_mysql_rc(rc, mysql); check_mysql_rc(rc, mysql);
sprintf(query, "UNINSTALL SONAME 'auth_ed25519'");
rc= mysql_query(mysql, query);
check_mysql_rc(rc, mysql);
return OK; return OK;
} }

3
unittest/libmariadb/my_test.h
View File

@@ -139,6 +139,7 @@ static char *username = 0;
static int force_tls= 0; static int force_tls= 0;
static uchar is_mariadb= 0; static uchar is_mariadb= 0;
static char *this_host= 0; static char *this_host= 0;
static char *plugindir= 0;
static unsigned char travis_test= 0; static unsigned char travis_test= 0;
/* /*
static struct my_option test_options[] = static struct my_option test_options[] =
@@ -513,6 +514,8 @@ void get_envvars() {
socketname= envvar; socketname= envvar;
diag("socketname: %s", socketname); diag("socketname: %s", socketname);
} }
if ((envvar= getenv("MYSQL_TEST_PLUGINDIR")))
plugindir= envvar;
} }
MYSQL *my_test_connect(MYSQL *mysql, MYSQL *my_test_connect(MYSQL *mysql,