diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-06-24 07:16:08 +0300 |
| commit | 2e4984c185ddcd2da789017cd147338846ff409a (patch) | |
| tree | 0293831900c860600efbaa747ea886d9d1cbf5bd /mysys/my_default.c | |
| parent | 792b53e80806df893ee62c9a1c1bd117114c8c6d (diff) | |
| parent | a6087e7dc1ef3561d8189c8db15e9591d0f9b520 (diff) | |
| download | mariadb-git-10.0-FusionIO.tar.gz | |
Merge tag 'mariadb-10.0.20' into 10.0-FusionIO10.0-FusionIO
Conflicts:
storage/innobase/os/os0file.cc
storage/xtradb/os/os0file.cc
storage/xtradb/srv/srv0start.cc
Diffstat (limited to 'mysys/my_default.c')
| -rw-r--r-- | mysys/my_default.c | 2 |
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++) |