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

Merge branch '3.3' into 3.4

Browse Source
This commit is contained in:
Georg Richter
2025-01-20 09:58:34 +01:00
parent 0074de2e90 53b7169315
commit ba64123b45
11 changed files with 152 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
unittest/libmariadb/my_test.h
View File

@@ -577,6 +577,15 @@ static int reset_connection(MYSQL *mysql) {
return OK;
}
static char *check_envvar(const char *envvar)
{
char *p = getenv(envvar);
if (p && p[0])
return p;
return NULL;
}
/*
* function get_envvars((
*
@@ -595,51 +604,44 @@ void get_envvars() {
if (getenv("TRAVIS_JOB_ID"))
travis_test= 1;
if (!hostname && (envvar= getenv("MYSQL_TEST_HOST")))
hostname= envvar;
if (!hostname)
hostname= check_envvar("MYSQL_TEST_HOST");
if (!username && !(username= check_envvar("MYSQL_TEST_USER")))
username= (char *)"root";
if (!username)
{
if ((envvar= getenv("MYSQL_TEST_USER")))
username= envvar;
else
username= (char *)"root";
}
if (!password && (envvar= getenv("MYSQL_TEST_PASSWD")))
password= envvar;
if (!schema && (envvar= getenv("MYSQL_TEST_DB")))
schema= envvar;
if (!schema)
if (!password)
password= check_envvar("MYSQL_TEST_PASSWD");
if (!schema && !(schema= check_envvar("MYSQL_TEST_DB")))
schema= "test";
if (!port)
{
if ((envvar= getenv("MYSQL_TEST_PORT")))
if ((envvar= check_envvar("MYSQL_TEST_PORT")) ||
(envvar= check_envvar("MASTER_MYPORT")))
port= atoi(envvar);
else if ((envvar= getenv("MASTER_MYPORT")))
port= atoi(envvar);
diag("port: %d", port);
}
if (!ssl_port)
{
if ((envvar= getenv("MYSQL_TEST_SSL_PORT")))
if ((envvar= check_envvar("MYSQL_TEST_SSL_PORT")))
ssl_port= atoi(envvar);
else
ssl_port = port;
diag("ssl_port: %d", ssl_port);
}
if (!force_tls && (envvar= getenv("MYSQL_TEST_TLS")))
if (!force_tls && (envvar= check_envvar("MYSQL_TEST_TLS")))
force_tls= atoi(envvar);
if (!socketname)
{
if ((envvar= getenv("MYSQL_TEST_SOCKET")))
socketname= envvar;
else if ((envvar= getenv("MASTER_MYSOCK")))
if ((envvar= check_envvar("MYSQL_TEST_SOCKET")) ||
(envvar= check_envvar("MASTER_MYSOCK")))
socketname= envvar;
diag("socketname: %s", socketname);
}
if ((envvar= getenv("MYSQL_TEST_PLUGINDIR")))
if ((envvar= check_envvar("MYSQL_TEST_PLUGINDIR")))
plugindir= envvar;
if (IS_XPAND())