Fixed bug that I accidently introduced in mysql_tzinfo_to_sql

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'

1 files changed, 4 insertions, 3 deletions

diff --git a/sql/tztime.cc b/sql/tztime.cc
index 7cfae1529ab..da23d6fc8c2 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -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;
     }