aboutsummaryrefslogtreecommitdiff
path: root/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2017-01-19 22:29:04 +0000
committerMark Felder <feld@FreeBSD.org>2017-01-19 22:29:04 +0000
commit7164158100ba470c4a1e91e89a9ea675bf5c6482 (patch)
treef3960b025d80b2da754b7ec872fe8d481af47e25 /databases/mysql56-server/files/patch-mysys_ssl_my_default.cc
parenteb1efbe0399c4433b3ac4957af0aa26a858e90d8 (diff)
downloadports-7164158100ba470c4a1e91e89a9ea675bf5c6482.tar.gz
ports-7164158100ba470c4a1e91e89a9ea675bf5c6482.zip
databases/mysql56: Update to 5.6.35
- Port improvements from MySQL 5.7 port - Use system libs instead of bundled - Fix many open PRs - Change MAINTAINER PR: 216244 192657 198812 199751 205093 PR: 209618 211248 205983 209338
Notes
Notes: svn path=/head/; revision=431919
Diffstat (limited to 'databases/mysql56-server/files/patch-mysys_ssl_my_default.cc')
-rw-r--r--databases/mysql56-server/files/patch-mysys_ssl_my_default.cc50
1 files changed, 40 insertions, 10 deletions
diff --git a/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc b/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc
index f6f38decb8ec..fa06468ce959 100644
--- a/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc
+++ b/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc
@@ -1,6 +1,6 @@
---- mysys_ssl/my_default.cc.orig 2013-01-22 17:54:49.000000000 +0100
-+++ mysys_ssl/my_default.cc 2013-02-13 11:08:15.000000000 +0100
-@@ -119,7 +119,7 @@
+--- mysys_ssl/my_default.cc.orig 2016-11-28 13:36:22 UTC
++++ mysys_ssl/my_default.cc
+@@ -110,7 +110,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;
-@@ -1395,7 +1395,10 @@
+@@ -903,6 +903,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++;
+@@ -1241,7 +1249,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);
+ }
+ }
+ }
+@@ -1400,13 +1409,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
-@@ -1466,7 +1469,7 @@
+
+@@ -1477,7 +1481,7 @@ int check_file_permissions(const char *f
MY_STAT stat_info;
if (!my_stat(file_name,&stat_info,MYF(0)))