diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2019-07-23 06:24:24 +0000 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2019-07-23 06:24:24 +0000 |
| commit | f8b9a0372aa207512fb7d4e331d1f9898455d090 (patch) | |
| tree | b546ed7668451943b54ac5a24cda5d222546db26 /databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc | |
| parent | Fix build as user (diff) | |
databases/mysqlwsrep57-server: Upgrade from 5.7.25 to 5.7.26
PR: 239374
Submitted by: Teemu Ollakka <teemu.ollakka@galeracluster.com>
Diffstat (limited to 'databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc')
| -rw-r--r-- | databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc b/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc index ea05679341fa..b175f85fc7d2 100644 --- a/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc +++ b/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc @@ -1,7 +1,7 @@ ---- mysys_ssl/my_default.cc.orig 2016-08-25 11:52:06 UTC +--- mysys_ssl/my_default.cc.orig 2019-07-17 18:38:36 UTC +++ mysys_ssl/my_default.cc -@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA - +@@ -120,7 +120,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,}; + #endif /* WITH_WREP */ /* Which directories are searched for options (and in which order) */ -#define MAX_DEFAULT_DIRS 6 @@ -9,9 +9,9 @@ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ static const char **default_directories = NULL; -@@ -914,6 +914,14 @@ static int search_default_file_with_ext( - return 1; /* Ignore wrong files */ - } +@@ -936,6 +936,14 @@ static int search_default_file_with_ext(Process_option + strncpy(wsrep_defaults_file, name, sizeof(wsrep_defaults_file) - 1); + #endif /* WITH_WSREP */ + if (strstr(name, "/etc") == name) + { @@ -24,7 +24,7 @@ while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) { line++; -@@ -1252,7 +1260,8 @@ void my_print_default_files(const char * +@@ -1274,7 +1282,8 @@ void my_print_default_files(const char *conf_file) end[(strlen(end)-1)] = ' '; else strxmov(end, conf_file, *ext , " ", NullS); @@ -34,23 +34,24 @@ } } } -@@ -1411,13 +1420,8 @@ static const char **init_default_directo +@@ -1433,14 +1442,9 @@ static const char **init_default_directories(MEM_ROOT #else - errors += add_directory(alloc, "/etc/", dirs); - errors += add_directory(alloc, "/etc/mysql/", dirs); -- ++ errors += add_directory(alloc, "/usr/local/etc/", dirs); ++ errors += add_directory(alloc, "/usr/local/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 -@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f + if ((env= getenv("MYSQL_HOME"))) +@@ -1510,7 +1514,7 @@ int check_file_permissions(const char *file_name, my_b MY_STAT stat_info; if (!my_stat(file_name,&stat_info,MYF(0))) |