diff options
author | Alex Dupre <ale@FreeBSD.org> | 2010-12-27 15:02:38 +0000 |
---|---|---|
committer | Alex Dupre <ale@FreeBSD.org> | 2010-12-27 15:02:38 +0000 |
commit | d9029c513982bd669b22c88b2f04cd4cfd5c201f (patch) | |
tree | 7f5fb76f05a3aae44742dda07753ffe091a58bfd /databases/percona55-client/files/patch-mysys_default.c | |
parent | - Update to 0.062 (diff) |
Update MySQL to 5.5.8 GA release. Read UPDATING.
Major changes:
- new installation layout, resembling RPM packages:
- client = Client Utilities + Development Libraries + Shared components
- server = MySQL Server + Embedded
- new build system: cmake instead of autotools
- fewer port knobs
Expect various breakages, but if we are lucky this could become the new default
mysql port.
Notes
Notes:
svn path=/head/; revision=266994
Diffstat (limited to 'databases/percona55-client/files/patch-mysys_default.c')
-rw-r--r-- | databases/percona55-client/files/patch-mysys_default.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/databases/percona55-client/files/patch-mysys_default.c b/databases/percona55-client/files/patch-mysys_default.c new file mode 100644 index 000000000000..816105371bdf --- /dev/null +++ b/databases/percona55-client/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 |