diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2008-09-23 05:43:45 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2008-09-23 05:43:45 +0000 |
| commit | a4b9511333af542ad1b15db44f165ff122cc32ac (patch) | |
| tree | 4c113cc2d53b5310d2ac6b5bc5dc936821348f9c /databases/mysql54-server/files/patch-mysys_default.c | |
| parent | f24f3c8898d74c3c6a2a7bc0c43e9b3065ee9153 (diff) | |
Update to 5.1.28-rc release.
Notes
Notes:
svn path=/head/; revision=220492
Diffstat (limited to 'databases/mysql54-server/files/patch-mysys_default.c')
| -rw-r--r-- | databases/mysql54-server/files/patch-mysys_default.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/databases/mysql54-server/files/patch-mysys_default.c b/databases/mysql54-server/files/patch-mysys_default.c index a202932767ea..d9fa1b430881 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 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("~/"); |