Commit 6774e86d authored by Alexander Barkov's avatar Alexander Barkov

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.
parent 24c1bff3
...@@ -2500,7 +2500,8 @@ scan_tz_dir(char * name_end, uint symlink_recursion_level) ...@@ -2500,7 +2500,8 @@ scan_tz_dir(char * name_end, uint symlink_recursion_level)
char *name_end_tmp; char *name_end_tmp;
uint i; 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; return 1;
name_end= strmake(name_end, "/", FN_REFLEN - (name_end - fullname)); name_end= strmake(name_end, "/", FN_REFLEN - (name_end - fullname));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment