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

Removed automatic detection of program name

Browse Source
This commit is contained in:
Georg Richter
2018-02-16 11:43:32 +01:00
parent 67cc3438a8
commit eefaadfe21
5 changed files with 7 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -139,10 +139,6 @@ SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDBUG_OFF")
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF") SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")
ADD_DEFINITIONS(-D_GNU_SOURCE=1)
CHECK_FUNCTION_EXISTS(program_invocation_short_name HAVE_PROGRAM_INVOCATION_SHORT_NAME)
CHECK_FUNCTION_EXISTS(getprogname HAVE_GETPROGNAME)
IF(CMAKE_COMPILER_IS_GNUCC) IF(CMAKE_COMPILER_IS_GNUCC)
INCLUDE(CheckCCompilerFlag) INCLUDE(CheckCCompilerFlag)
SET(GCC_FLAGS -Wunused -Wno-uninitialized -Wall -Wextra -Wformat-security -Wno-init-self -Wwrite-strings -Wshift-count-overflow -Wdeclaration-after-statement) SET(GCC_FLAGS -Wunused -Wno-uninitialized -Wall -Wextra -Wformat-security -Wno-init-self -Wwrite-strings -Wshift-count-overflow -Wdeclaration-after-statement)

2
include/ma_config.h.in
View File

@@ -84,7 +84,6 @@
#cmakedefine HAVE_GETPAGESIZE 1 #cmakedefine HAVE_GETPAGESIZE 1
#cmakedefine HAVE_GETPASS 1 #cmakedefine HAVE_GETPASS 1
#cmakedefine HAVE_GETPASSPHRASE 1 #cmakedefine HAVE_GETPASSPHRASE 1
#cmakedefine HAVE_GETPROGNAME 1
#cmakedefine HAVE_GETPWNAM 1 #cmakedefine HAVE_GETPWNAM 1
#cmakedefine HAVE_GETPWUID 1 #cmakedefine HAVE_GETPWUID 1
#cmakedefine HAVE_GETRLIMIT 1 #cmakedefine HAVE_GETRLIMIT 1
@@ -110,7 +109,6 @@
#cmakedefine HAVE_PERROR 1 #cmakedefine HAVE_PERROR 1
#cmakedefine HAVE_POLL 1 #cmakedefine HAVE_POLL 1
#cmakedefine HAVE_PREAD 1 #cmakedefine HAVE_PREAD 1
#cmakedefine HAVE_PROGRAM_INVOCATION_SHORT_NAME 1
#cmakedefine HAVE_PTHREAD_ATTR_CREATE 1 #cmakedefine HAVE_PTHREAD_ATTR_CREATE 1
#cmakedefine HAVE_PTHREAD_ATTR_GETSTACKSIZE 1 #cmakedefine HAVE_PTHREAD_ATTR_GETSTACKSIZE 1
#cmakedefine HAVE_PTHREAD_ATTR_SETPRIO 1 #cmakedefine HAVE_PTHREAD_ATTR_SETPRIO 1

21
libmariadb/mariadb_lib.c
View File

@@ -2653,26 +2653,7 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...)
OPT_SET_VALUE_STR(&mysql->options, my_cnf_file, (char *)arg1); OPT_SET_VALUE_STR(&mysql->options, my_cnf_file, (char *)arg1);
break; break;
case MYSQL_READ_DEFAULT_GROUP: case MYSQL_READ_DEFAULT_GROUP:
if (!arg1 || !((char *)arg1)[0]) OPT_SET_VALUE_STR(&mysql->options, my_cnf_group, arg1 ? (char *)arg1 : "");
{
#if defined(HAVE_PROGRAM_INVOCATION_SHORT_NAME)
const char * appname = program_invocation_short_name;
#elif defined(HAVE_GETPROGNAME)
const char * appname = getprogname();
#elif defined(WIN32)
char module_filename[MAX_PATH];
char appname[MAX_PATH]="";
if (GetModuleFileName(NULL, module_filename, MAX_PATH))
{
_splitpath(module_filename,NULL, NULL, appname, NULL);
}
#else
const char * appname = "";
#endif
OPT_SET_VALUE_STR(&mysql->options, my_cnf_group, appname);
break;
}
OPT_SET_VALUE_STR(&mysql->options, my_cnf_group, (char *)arg1);
break; break;
case MYSQL_SET_CHARSET_DIR: case MYSQL_SET_CHARSET_DIR:
OPT_SET_VALUE_STR(&mysql->options, charset_dir, arg1); OPT_SET_VALUE_STR(&mysql->options, charset_dir, arg1);

11
unittest/libmariadb/connection.c
View File

@@ -1226,12 +1226,10 @@ if (!(fp= fopen("./mdev13100.cnf", "w")))
return FAIL; return FAIL;
fprintf(fp, "[client]\n"); fprintf(fp, "[client]\n");
fprintf(fp, "default-character-set=latin1\n");
fprintf(fp, "[client-server]\n");
fprintf(fp, "default-character-set=latin1\n");
fprintf(fp, "[client-mariadb]\n");
fprintf(fp, "default-character-set=utf8\n"); fprintf(fp, "default-character-set=utf8\n");
fprintf(fp, "[connection]\n"); fprintf(fp, "[client-server]\n");
fprintf(fp, "default-character-set=utf8\n");
fprintf(fp, "[client-mariadb]\n");
fprintf(fp, "default-character-set=latin2\n"); fprintf(fp, "default-character-set=latin2\n");
fclose(fp); fclose(fp);
@@ -1247,12 +1245,13 @@ if (!(fp= fopen("./mdev13100.cnf", "w")))
diag("Error: %s", mysql_error(mysql)); diag("Error: %s", mysql_error(mysql));
return FAIL; return FAIL;
} }
diag("character set: %s", mysql_character_set_name(mysql));
FAIL_IF(strcmp("latin2", mysql_character_set_name(mysql)), "Expected charset latin2"); FAIL_IF(strcmp("latin2", mysql_character_set_name(mysql)), "Expected charset latin2");
mysql_close(mysql); mysql_close(mysql);
remove("./mdev13100.cnf"); remove("./mdev13100.cnf");
return OK; return OK;
} }
static int test_conc276(MYSQL *unused __attribute__((unused))) static int test_conc276(MYSQL *unused __attribute__((unused)))

2
unittest/libmariadb/misc.c
View File

@@ -1079,7 +1079,7 @@ static int test_mdev12965(MYSQL *unused __attribute__((unused)))
fp= fopen(cnf_file1, "w"); fp= fopen(cnf_file1, "w");
FAIL_IF(!fp, "fopen"); FAIL_IF(!fp, "fopen");
fprintf(fp, "[misc]\ndefault-character-set=latin2\n[client]\nreconnect=1\n"); fprintf(fp, "[client]\ndefault-character-set=latin2\nreconnect=1\n");
fclose(fp); fclose(fp);
mysql_options(mysql, MYSQL_READ_DEFAULT_GROUP, NULL); mysql_options(mysql, MYSQL_READ_DEFAULT_GROUP, NULL);