diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2010-12-04 09:10:24 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2010-12-04 09:10:24 +0000 |
| commit | 058f99bb6be204f053b06d0ad32951709df6109f (patch) | |
| tree | d55abf725c2c1bef9c08f04fa131ff3b081ef61a /databases/percona55-server/files/patch-mysys_default.c | |
| parent | ddf00fcd5395624bf1ee4fb0f5ac3b1eac59bb23 (diff) | |
This commit was manufactured by cvs2svn to create tag 'RELEASE_6_EOL'.6-eol
Diffstat (limited to 'databases/percona55-server/files/patch-mysys_default.c')
| -rw-r--r-- | databases/percona55-server/files/patch-mysys_default.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/databases/percona55-server/files/patch-mysys_default.c b/databases/percona55-server/files/patch-mysys_default.c deleted file mode 100644 index 816105371bdf..000000000000 --- a/databases/percona55-server/files/patch-mysys_default.c +++ /dev/null @@ -1,31 +0,0 @@ ---- mysys/default.c.orig 2010-11-02 23:01:13.000000000 +0100 -+++ mysys/default.c 2010-11-10 16:39:51.000000000 +0100 -@@ -70,7 +70,7 @@ - - /* 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; - -@@ -711,7 +711,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 -@@ -1153,7 +1153,10 @@ - - #if defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR[0]) -+ { - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); -+ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs); -+ } - #endif /* DEFAULT_SYSCONFDIR */ - - #endif |