summaryrefslogtreecommitdiff
path: root/databases/mysql54-server/files/patch-mysys_default.c
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2007-02-04 09:32:18 +0000
committerAlex Dupre <ale@FreeBSD.org>2007-02-04 09:32:18 +0000
commit8c875e3e44dba4ccd81bf44862b2e60efdf8bf87 (patch)
tree6029e8716f8776fd30f81e89b7edf24b234c324e /databases/mysql54-server/files/patch-mysys_default.c
parentFix build. (diff)
Update to 5.1.15 release.
Notes
Notes: svn path=/head/; revision=184109
Diffstat (limited to 'databases/mysql54-server/files/patch-mysys_default.c')
-rw-r--r--databases/mysql54-server/files/patch-mysys_default.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/databases/mysql54-server/files/patch-mysys_default.c b/databases/mysql54-server/files/patch-mysys_default.c
index 7c1dbe23aa9a..02f3fa45eb91 100644
--- a/databases/mysql54-server/files/patch-mysys_default.c
+++ b/databases/mysql54-server/files/patch-mysys_default.c
@@ -1,6 +1,6 @@
---- mysys/default.c.orig Thu May 26 15:26:56 2005
-+++ mysys/default.c Fri Jun 3 17:16:59 2005
-@@ -517,7 +517,7 @@
+--- mysys/default.c.orig Tue Jan 30 09:34:13 2007
++++ mysys/default.c Sat Feb 3 17:12:31 2007
+@@ -608,7 +608,7 @@
{
MY_STAT stat_info;
if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,11 +9,12 @@
/*
Ignore world-writable regular files.
This is mainly done to protect us to not read a file created by
-@@ -867,9 +867,8 @@
- *ptr++= env;
- #endif
+@@ -1013,9 +1013,9 @@
+ #else
*ptr++= "/etc/";
+ *ptr++= "/etc/mysql/";
+ *ptr++= "%%PREFIX%%/etc/";
++ *ptr++= "%%PREFIX%%/etc/mysql/";
#endif
- if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
- *ptr++= env;