summaryrefslogtreecommitdiff
path: root/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc
diff options
context:
space:
mode:
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.cc31
1 files changed, 0 insertions, 31 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
deleted file mode 100644
index cb52de18bebe..000000000000
--- a/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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.