diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91d43106..6a777d6b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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_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)
   INCLUDE(CheckCCompilerFlag)
   SET(GCC_FLAGS -Wunused -Wno-uninitialized  -Wall -Wextra -Wformat-security -Wno-init-self -Wwrite-strings -Wshift-count-overflow -Wdeclaration-after-statement)
diff --git a/include/ma_config.h.in b/include/ma_config.h.in
index eff5635c..60fb77b7 100644
--- a/include/ma_config.h.in
+++ b/include/ma_config.h.in
@@ -84,7 +84,6 @@
 #cmakedefine HAVE_GETPAGESIZE 1
 #cmakedefine HAVE_GETPASS 1
 #cmakedefine HAVE_GETPASSPHRASE 1
-#cmakedefine HAVE_GETPROGNAME 1
 #cmakedefine HAVE_GETPWNAM 1
 #cmakedefine HAVE_GETPWUID 1
 #cmakedefine HAVE_GETRLIMIT 1
@@ -110,7 +109,6 @@
 #cmakedefine HAVE_PERROR 1
 #cmakedefine HAVE_POLL 1
 #cmakedefine HAVE_PREAD 1
-#cmakedefine HAVE_PROGRAM_INVOCATION_SHORT_NAME 1
 #cmakedefine HAVE_PTHREAD_ATTR_CREATE 1
 #cmakedefine HAVE_PTHREAD_ATTR_GETSTACKSIZE 1
 #cmakedefine HAVE_PTHREAD_ATTR_SETPRIO 1
diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
index 72239cf7..97c1a194 100644
--- a/libmariadb/mariadb_lib.c
+++ b/libmariadb/mariadb_lib.c
@@ -2653,26 +2653,7 @@ mysql_optionsv(MYSQL *mysql,enum mysql_option option, ...)
     OPT_SET_VALUE_STR(&mysql->options, my_cnf_file, (char *)arg1);
     break;
   case MYSQL_READ_DEFAULT_GROUP:
-    if (!arg1 || !((char *)arg1)[0])
-    {
-#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);
+    OPT_SET_VALUE_STR(&mysql->options, my_cnf_group, arg1 ? (char *)arg1 : "");
     break;
   case MYSQL_SET_CHARSET_DIR:
     OPT_SET_VALUE_STR(&mysql->options, charset_dir, arg1);
diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c
index 019fc62e..95a56ffa 100644
--- a/unittest/libmariadb/connection.c
+++ b/unittest/libmariadb/connection.c
@@ -1226,12 +1226,10 @@ if (!(fp= fopen("./mdev13100.cnf", "w")))
     return FAIL;
 
   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, "[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");
 
   fclose(fp);
@@ -1247,12 +1245,13 @@ if (!(fp= fopen("./mdev13100.cnf", "w")))
     diag("Error: %s", mysql_error(mysql));
     return FAIL;
   }
+  diag("character set: %s", mysql_character_set_name(mysql));
   FAIL_IF(strcmp("latin2", mysql_character_set_name(mysql)), "Expected charset latin2");
   mysql_close(mysql);
 
   remove("./mdev13100.cnf");
 
-  return OK; 
+  return OK;
 }
 
 static int test_conc276(MYSQL *unused __attribute__((unused)))
diff --git a/unittest/libmariadb/misc.c b/unittest/libmariadb/misc.c
index 337c384b..f572dc01 100644
--- a/unittest/libmariadb/misc.c
+++ b/unittest/libmariadb/misc.c
@@ -1079,7 +1079,7 @@ static int test_mdev12965(MYSQL *unused __attribute__((unused)))
   fp= fopen(cnf_file1, "w");
   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);
 
   mysql_options(mysql, MYSQL_READ_DEFAULT_GROUP, NULL);