diff options
Diffstat (limited to 'databases/mysql57-client/files/patch-mysys__ssl_my__default.cc')
| -rw-r--r-- | databases/mysql57-client/files/patch-mysys__ssl_my__default.cc | 48 |
1 files changed, 39 insertions, 9 deletions
diff --git a/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc b/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc index ca7dd233539d..ea05679341fa 100644 --- a/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc +++ b/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc @@ -1,6 +1,6 @@ ---- mysys_ssl/my_default.cc.orig 2016-03-28 18:06:12 UTC +--- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC +++ mysys_ssl/my_default.cc -@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE; +@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA /* Which directories are searched for options (and in which order) */ @@ -9,18 +9,48 @@ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ static const char **default_directories = NULL; -@@ -1409,7 +1409,10 @@ static const char **init_default_directo +@@ -914,6 +914,14 @@ static int search_default_file_with_ext( + return 1; /* Ignore wrong files */ + } - #if defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR[0]) ++ if (strstr(name, "/etc") == name) + { - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); -+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs); ++ fprintf(stderr, ++ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", ++ name,name); ++ goto err; + } - #endif /* DEFAULT_SYSCONFDIR */ ++ + while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) + { + line++; +@@ -1252,7 +1260,8 @@ void my_print_default_files(const char * + end[(strlen(end)-1)] = ' '; + else + strxmov(end, conf_file, *ext , " ", NullS); +- fputs(name, stdout); ++ if (strstr(name, "/etc") != name) ++ fputs(name, stdout); + } + } + } +@@ -1411,13 +1420,8 @@ static const char **init_default_directo + + #else + +- errors += add_directory(alloc, "/etc/", dirs); +- errors += add_directory(alloc, "/etc/mysql/", dirs); +- +-#if defined(DEFAULT_SYSCONFDIR) +- if (DEFAULT_SYSCONFDIR[0]) +- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); +-#endif /* DEFAULT_SYSCONFDIR */ ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); #endif -@@ -1480,7 +1483,7 @@ int check_file_permissions(const char *f + +@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f MY_STAT stat_info; if (!my_stat(file_name,&stat_info,MYF(0))) |