mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 07:05:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug that I accidently introduced in mysql_tzinfo_to_sql

Browse source 
Added test cases

mysql-test/r/mysql_tzinfo_to_sql_symlink.result:
  Updated results
mysql-test/std_data/zoneinfo/garbage:
  test file
mysql-test/std_data/zoneinfo/ignored.tab:
  test file
mysql-test/t/mysql_tzinfo_to_sql_symlink.test:
  Added test cases for all options
sql/tztime.cc:
  Better error messages.
  Fixed wrong place for 'continue'
This commit is contained in:
Michael Widenius 2014-01-26 21:47:31 +01:00 • committed by Sergei Golubchik
commit 6e699eb409
3 changed files with 68 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sql/tztime.cc
View file

@ -2558,8 +2558,8 @@ scan_tz_dir(char * name_end, uint symlink_recursion_level, uint verbose)
fflush(stdout);
fprintf(stderr, "Warning: Skipping directory '%s': "
"to avoid infinite symlink recursion.\n", fullname);
continue;
}
continue;
}
if (scan_tz_dir(name_end_tmp, symlink_recursion_level + is_symlink,
verbose))
@ -2720,8 +2720,9 @@ main(int argc, char **argv)
if (scan_tz_dir(root_name_end, 0, opt_verbose))
{
fflush(stdout);
fprintf(stderr, "There were fatal errors during processing "
"of zoneinfo directory\n");
fprintf(stderr,
"There were fatal errors during processing "
"of zoneinfo directory '%s'\n", fullname);
return 1;
}