From 6774e86d836f83bf0c7f3a9f2facf15ad89f394e Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Tue, 26 Nov 2013 11:26:08 +0400 Subject: 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. --- sql/tztime.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/tztime.cc') 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)); -- cgit v1.2.1