Changeset View
Changeset View
Standalone View
Standalone View
databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc
- This file was added.
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:keywords | null | FreeBSD=%H \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
--- mysys_ssl/my_default.cc.orig 2017-01-25 07:58:07 UTC | |||||
+++ mysys_ssl/my_default.cc | |||||
@@ -116,7 +116,7 @@ char wsrep_defaults_group_suffix[FN_EXTL | |||||
#endif /* WITH_WREP */ | |||||
/* Which directories are searched for options (and in which order) */ | |||||
-#define MAX_DEFAULT_DIRS 6 | |||||
+#define MAX_DEFAULT_DIRS 7 | |||||
#define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ | |||||
static const char **default_directories = NULL; | |||||
@@ -1423,7 +1423,10 @@ static const char **init_default_directo | |||||
#if defined(DEFAULT_SYSCONFDIR) | |||||
if (DEFAULT_SYSCONFDIR[0]) | |||||
+ { | |||||
errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); | |||||
+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs); | |||||
+ } | |||||
#endif /* DEFAULT_SYSCONFDIR */ | |||||
#endif | |||||
@@ -1495,7 +1498,7 @@ int check_file_permissions(const char *f | |||||
MY_STAT stat_info; | |||||
if (!my_stat(file_name,&stat_info,MYF(0))) | |||||
- return 1; | |||||
+ return 0; | |||||
/* | |||||
Ignore .mylogin.cnf file if not exclusively readable/writable | |||||
by current user. |