diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2008-11-19 10:43:57 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2008-11-19 10:43:57 +0000 |
| commit | f982be45e81588a27383cd1a3eb12789b8498904 (patch) | |
| tree | 07be283d015b2c39f95e655cb7328ff355bc47fa /databases/mysql51-server/files/patch-mysys_default.c | |
| parent | - Fix modes of the temp directory [1] (diff) | |
This commit was manufactured by cvs2svn to create tag 'RELEASE_6_4_0'.release/6.4.0
Notes
Notes:
svn path=/head/; revision=223035
svn path=/tags/RELEASE_6_4_0/; revision=223036; tag=release/6.4.0
Diffstat (limited to 'databases/mysql51-server/files/patch-mysys_default.c')
| -rw-r--r-- | databases/mysql51-server/files/patch-mysys_default.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/databases/mysql51-server/files/patch-mysys_default.c b/databases/mysql51-server/files/patch-mysys_default.c index a202932767ea..60d2b30ba25e 100644 --- a/databases/mysql51-server/files/patch-mysys_default.c +++ b/databases/mysql51-server/files/patch-mysys_default.c @@ -1,6 +1,6 @@ ---- mysys/default.c.orig 2008-04-08 13:23:13.000000000 +0200 -+++ mysys/default.c 2008-04-21 19:20:44.000000000 +0200 -@@ -623,7 +623,7 @@ +--- mysys/default.c.orig 2008-08-28 17:40:47.000000000 +0200 ++++ mysys/default.c 2008-09-16 08:20:23.000000000 +0200 +@@ -638,7 +638,7 @@ { MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(0))) @@ -9,11 +9,14 @@ /* Ignore world-writable regular files. This is mainly done to protect us to not read a file created by -@@ -1105,6 +1105,7 @@ - #ifdef DEFAULT_SYSCONFDIR +@@ -1091,7 +1091,10 @@ + + #if defined(DEFAULT_SYSCONFDIR) if (DEFAULT_SYSCONFDIR != "") - ADD_DIRECTORY(DEFAULT_SYSCONFDIR); -+ ADD_DIRECTORY(DEFAULT_SYSCONFDIR "/mysql/"); ++ { + errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); ++ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs); ++ } + #endif /* DEFAULT_SYSCONFDIR */ + #endif - ADD_COMMON_DIRECTORIES(); - ADD_DIRECTORY("~/"); |