Merge 10.1 into 10.2

1 files changed, 6 insertions, 1 deletions

diff --git a/mysys/my_default.c b/mysys/my_default.c
index a8c3c53adf6..6324c19bdda 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;
 
@@ -1182,7 +1182,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