diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-01-04 22:41:43 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-01-06 16:25:25 +0100 |
| commit | eaf6b053b83d2a46250834e8367477bd3d85d38f (patch) | |
| tree | 16b72fa66e62e77cb557343c1f39f9f35ed29e47 /mysys/my_default.c | |
| parent | 82b8741ad00e1ffdcbd0e2cf82f3ab31a7f3ce8b (diff) | |
| download | mariadb-git-eaf6b053b83d2a46250834e8367477bd3d85d38f.tar.gz | |
MDEV-11087 Search path for my.ini is wrong for default installation
Add <install_root>/data/my.ini to the search path - this my.ini location
is used since MariaDB 5.2
Diffstat (limited to 'mysys/my_default.c')
| -rw-r--r-- | mysys/my_default.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mysys/my_default.c b/mysys/my_default.c index 0f9b70ca326..03cfa973b2c 100644 --- a/mysys/my_default.c +++ b/mysys/my_default.c @@ -90,7 +90,7 @@ static my_bool defaults_already_read= FALSE; /* 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; @@ -1219,7 +1219,12 @@ static const char **init_default_directories(MEM_ROOT *alloc) errors += add_directory(alloc, "C:/", dirs); if (my_get_module_parent(fname_buffer, sizeof(fname_buffer)) != NULL) + { + errors += add_directory(alloc, fname_buffer, dirs); + + strncat(fname_buffer, "/data", sizeof(fname_buffer)); errors += add_directory(alloc, fname_buffer, dirs); + } } #else |