diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-11-26 11:26:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-11-26 11:26:08 +0400 |
| commit | 6774e86d836f83bf0c7f3a9f2facf15ad89f394e (patch) | |
| tree | b602a0d1a7bf9514b02253d9a0fce961f64527d3 /sql/tztime.cc | |
| parent | 24c1bff3e2939d20adf5637e4bb1583b896fe6fb (diff) | |
| download | mariadb-git-6774e86d836f83bf0c7f3a9f2facf15ad89f394e.tar.gz | |
Fixing mtr failures in mysql_tzinfo_to_sql_symlink.test on Labrador:
sort directory data to make sure the same data order in the output
of mysql_tzinfo_to_sql on all platforms.
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 9fb4f9e7b28..0a574fb7688 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -2500,7 +2500,8 @@ scan_tz_dir(char * name_end, uint symlink_recursion_level) char *name_end_tmp; uint i; - if (!(cur_dir= my_dir(fullname, MYF(MY_WANT_STAT)))) + /* Sort directory data, to pass mtr tests on different platforms. */ + if (!(cur_dir= my_dir(fullname, MYF(MY_WANT_STAT|MY_WANT_SORT)))) return 1; name_end= strmake(name_end, "/", FN_REFLEN - (name_end - fullname)); |