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 for MDEV-12965 and MDEV-13100:

Browse Source 
If no configuration file and no configuration group was specified, Connector/C ddoesn't read any configurationm files.
By default the follwing groups will be read:
- client
- client-server
- client-mariadb

If no configuration file was specified, Connector/C looks up for configuration files in following locations:
- Windows:
  - System directory
  - Windows directory
  - C:\
  - Directoy from which the application was started
  - MYSQL_HOME environment variable
- Unix platforms
  - DEFAULT_SYSCONFIR (if specified)
  or
  - /etc and /etc/mysql
  - MYSQL_HOME environment variable
  - .my.cnf in home directory

Special case: If NULL or empty string will be passed for MYSQL_READ_DEFAULT_GROUP option Connector/C will read the default groups and the group which matches the application name.
This commit is contained in:
Georg Richter
2017-06-25 14:14:55 +02:00
parent 6f113bb118
commit e2df6d2552
7 changed files with 380 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
unittest/libmariadb/misc.c
View File

@@ -30,6 +30,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
/*
Bug#28075 "COM_DEBUG crashes mysqld"
*/
#ifdef _WIN32
#define R_OK 4
#endif
static int test_bug28075(MYSQL *mysql)
{
@@ -1051,6 +1054,49 @@ static int test_remote2(MYSQL *my)
}
#endif
#ifndef _WIN32
static int test_mdev12965(MYSQL *unused __attribute__((unused)))
{
MYSQL *mysql;
my_bool reconnect = 0;
FILE *fp= NULL;
char *env= getenv("HOME");
char cnf_file1[FN_REFLEN + 1],
cnf_file2[FN_REFLEN + 1];
snprintf(cnf_file1, FN_REFLEN, "%s%c.my.cnf", env, FN_LIBCHAR);
snprintf(cnf_file2, FN_REFLEN, "%s%cmy.cnf", env, FN_LIBCHAR);
if (!access(cnf_file1, R_OK) || !access(cnf_file2, R_OK))
{
diag("Skip this test, it would overwrite configuration files in your home directory");
return SKIP;
}
mysql= mysql_init(NULL);
fp= fopen(cnf_file1, "w");
fprintf(fp, "[test]\ndefault-character-set=latin2");
fclose(fp);
fp= fopen(cnf_file2, "w");
fprintf(fp, "[test]\nreconnect=1");
fclose(fp);
mysql_options(mysql, MYSQL_READ_DEFAULT_GROUP, "test");
my_test_connect(mysql, hostname, username, password, schema,
0, socketname, 0), mysql_error(mysql);
remove(cnf_file1);
remove(cnf_file2);
FAIL_IF(strcmp(mysql_character_set_name(mysql), "latin2"), "expected charset latin2");
mysql_get_optionv(mysql, MYSQL_OPT_RECONNECT, &reconnect);
FAIL_IF(reconnect != 1, "expected reconnect=1");
mysql_close(mysql);
return OK;
}
#endif
static int test_get_info(MYSQL *mysql)
{
size_t sval;
@@ -1267,6 +1313,9 @@ static int test_wl6797(MYSQL *mysql)
}
struct my_tests_st my_tests[] = {
#ifndef _WIN32
{"test_mdev12965", test_mdev12965, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
#endif
{"test_wl6797", test_wl6797, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_server_status", test_server_status, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
{"test_read_timeout", test_read_timeout, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},