summaryrefslogtreecommitdiff
path: root/databases/mysql60-server/files/patch-mysys_default.c
blob: 7c1dbe23aa9a16a8384a2cfbc952564e6bc3fc42 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
--- 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 @@
   {
     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
@@ -867,9 +867,8 @@
     *ptr++= env;
 #endif
   *ptr++= "/etc/";
+  *ptr++= "%%PREFIX%%/etc/";
 #endif
-  if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
-    *ptr++= env;
   *ptr++= "";			/* Place for defaults_extra_file */
 #if !defined(__WIN__) && !defined(__NETWARE__)
   *ptr++= "~/";;