diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2016-01-10 20:02:30 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2016-01-10 20:02:30 +0000 |
| commit | 79c95318b4b6bb92d2ed30ac56c149a368607e8f (patch) | |
| tree | 1549f09cac4aaf07f7bf837c0d5a159e7256fb2a /databases/mysql57-server/files/patch-mysys__ssl_my__default.cc | |
| parent | databases/mysql57-client, databases/mysql57-server: (diff) | |
databases/mysql57-client, databases/mysql57-server:
re-add for proper repo-copy
PR: 204607
Diffstat (limited to 'databases/mysql57-server/files/patch-mysys__ssl_my__default.cc')
| -rw-r--r-- | databases/mysql57-server/files/patch-mysys__ssl_my__default.cc | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc b/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc new file mode 100644 index 000000000000..cb52de18bebe --- /dev/null +++ b/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc @@ -0,0 +1,31 @@ +--- mysys_ssl/my_default.cc.orig 2015-11-29 19:16:24 UTC ++++ mysys_ssl/my_default.cc +@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE; + + /* 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; + +@@ -1409,7 +1409,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 +@@ -1480,7 +1483,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. |