summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-02-25 09:43:31 +0100
committerSergei Golubchik <serg@mariadb.org>2015-02-25 09:43:31 +0100
commitcbf8cdc252a2c74e8f62e46646b4facde85b2d8e (patch)
treed69439063ea31c2fc7d5ab02426d35de25fae72a
parent6c09a72af586e2d8c866ba1cce9a9679bd87aca9 (diff)
downloadmariadb-git-cbf8cdc252a2c74e8f62e46646b4facde85b2d8e.tar.gz
MDEV-7530 !includedir reads files in random order
-rw-r--r--mysys/my_default.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_default.c b/mysys/my_default.c
index 0bd76a1cff0..8faee000a6a 100644
--- a/mysys/my_default.c
+++ b/mysys/my_default.c
@@ -843,7 +843,7 @@ static int search_default_file_with_ext(Process_option_func opt_handler,
ptr, name, line)))
goto err;
- if (!(search_dir= my_dir(ptr, MYF(MY_WME))))
+ if (!(search_dir= my_dir(ptr, MYF(MY_WME | MY_WANT_SORT))))
goto err;
for (i= 0; i < (uint) search_dir->number_of_files; i++)