diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-01-05 11:30:51 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-01-05 11:30:51 +0000 |
| commit | 87a0e0727b4a6e83720a41c543959f4b4e77df47 (patch) | |
| tree | 1965b778fee6ae0a18b6aaf9146088662c7552f6 /databases/mariadb55-server/files/patch-mysys_default.c | |
| parent | Mark moinmoin vulnerable (diff) | |
Add the 5.5 branch of MariaDB
PR: ports/174660
Submitted by: Alexandr Kovalenko <never@nevermind.kiev.ua>
Approved by: geoffroy desvernay <dgeo@centrale-marseille.fr>
(maintainer of databases/mariadb-*)
Diffstat (limited to 'databases/mariadb55-server/files/patch-mysys_default.c')
| -rw-r--r-- | databases/mariadb55-server/files/patch-mysys_default.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/databases/mariadb55-server/files/patch-mysys_default.c b/databases/mariadb55-server/files/patch-mysys_default.c new file mode 100644 index 000000000000..816105371bdf --- /dev/null +++ b/databases/mariadb55-server/files/patch-mysys_default.c @@ -0,0 +1,31 @@ +--- 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 |