blob: f6f38decb8ec9e7eab83d87e8eeaae9edd0630d0 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
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.
|
