diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2013-02-14 15:04:05 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2013-02-14 15:04:05 +0000 |
| commit | 43b36cb2d784a4542268d49d3f200575c05281d9 (patch) | |
| tree | 918e07f731398f4c18ffbf89741d46fff5341ff8 /databases/mysql56-server/files/patch-mysys_ssl_my_default.cc | |
| parent | update zpaq to 6.22 (diff) | |
Add MySQL 5.6.
Diffstat (limited to 'databases/mysql56-server/files/patch-mysys_ssl_my_default.cc')
| -rw-r--r-- | databases/mysql56-server/files/patch-mysys_ssl_my_default.cc | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc b/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc new file mode 100644 index 000000000000..f6f38decb8ec --- /dev/null +++ b/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc @@ -0,0 +1,31 @@ +--- mysys_ssl/my_default.cc.orig 2013-01-22 17:54:49.000000000 +0100 ++++ mysys_ssl/my_default.cc 2013-02-13 11:08:15.000000000 +0100 +@@ -119,7 +119,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; + +@@ -1395,7 +1395,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 +@@ -1466,7 +1469,7 @@ + MY_STAT stat_info; + + if (!my_stat(file_name,&stat_info,MYF(0))) +- return 1; ++ return 0; + /* + Ignore .mylogin.cnf file if not exclusively readable/writable + by current user. |