summaryrefslogtreecommitdiff
path: root/databases/mariadb101-client/files/patch-mysys_my_default.c
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2016-03-27 20:57:51 +0000
committerBernard Spil <brnrd@FreeBSD.org>2016-03-27 20:57:51 +0000
commit63fec1d6d4f53c480ff3db3308e0da8e029ca027 (patch)
tree8c457b51b278855ab62a43afb7b75378462e9a63 /databases/mariadb101-client/files/patch-mysys_my_default.c
parentNew port: multimedia/plexwatch (diff)
databases/mariadb101-{server,client}: Update to 10.1.13
- Update to version 10.1.13 - Make GSSAPI plugin optional [2] - Remove patches that are merged upstream - Re-generate patches that required fuzzing - Server - Fix OQGraph build failure [1] - Install server gssapi plugin only - Don't install gssapi libs/files that were moved to -client - Add license and readme file for TokuDB - Add tokuft_logprint and tokuftdump binaries - Client - Install client gssapi plugin - Enable PLIST_SUB for optional gssapi plugin - Add new plugins and ini file - Remove taocrypt patch, we don't build bundled SSL PR: 207675 [1], 207883 [2] Reviewed by: feld (mentor) Approved by: feld (mentor) Differential Revision: D5751
Notes
Notes: svn path=/head/; revision=412011
Diffstat (limited to 'databases/mariadb101-client/files/patch-mysys_my_default.c')
-rw-r--r--databases/mariadb101-client/files/patch-mysys_my_default.c61
1 files changed, 0 insertions, 61 deletions
diff --git a/databases/mariadb101-client/files/patch-mysys_my_default.c b/databases/mariadb101-client/files/patch-mysys_my_default.c
deleted file mode 100644
index 3dc729ebd263..000000000000
--- a/databases/mariadb101-client/files/patch-mysys_my_default.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- mysys/my_default.c.orig 2015-12-23 15:33:31 UTC
-+++ mysys/my_default.c
-@@ -90,7 +90,7 @@ static my_bool defaults_already_read= FA
-
- /* 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;
-
-@@ -784,7 +784,7 @@ static int search_default_file_with_ext(
- {
- MY_STAT stat_info;
- if (!my_stat(name,&stat_info,MYF(0)))
-- return 1;
-+ return 0;
- /*
- Ignore world-writable regular files.
- This is mainly done to protect us to not read a file created by
-@@ -802,6 +802,14 @@ static int search_default_file_with_ext(
- if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
- return 1; /* Ignore wrong files */
-
-+ if (strstr(name, "/etc") == name)
-+ {
-+ fprintf(stderr,
-+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+ name,name);
-+ goto err;
-+ }
-+
- while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
- {
- line++;
-@@ -1066,7 +1074,8 @@ void my_print_default_files(const char *
- if (name[0] == FN_HOMELIB) /* Add . to filenames in home */
- *end++= '.';
- strxmov(end, conf_file, *ext, " ", NullS);
-- fputs(name, stdout);
-+ if (strstr(name, "/etc") != name)
-+ fputs(name, stdout);
- }
- }
- }
-@@ -1222,13 +1231,10 @@ static const char **init_default_directo
-
- #else
-
--#if defined(DEFAULT_SYSCONFDIR)
-- if (DEFAULT_SYSCONFDIR[0])
-- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
--#else
- errors += add_directory(alloc, "/etc/", dirs);
- errors += add_directory(alloc, "/etc/mysql/", dirs);
--#endif /* DEFAULT_SYSCONFDIR */
-+ errors += add_directory(alloc, "/usr/local/etc/", dirs);
-+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
-
- #endif
-