--- sql/tztime.cc.orig	2021-02-19 03:41:03.000000000 -0600
+++ sql/tztime.cc	2021-05-01 00:00:00.000000000 -0500
@@ -2486,12 +2486,16 @@
 char *root_name_end;
 
 /*
-  known file types that exist in the zoneinfo directory that are safe to
+  known filenames that exist in the zoneinfo directory that are safe to
   silently skip
 */
-const char *known_extensions[]= {
-  ".tab",
-  NullS
+const char *known_basenames[]= {
+  "iso3166.tab",
+  "leap-seconds.list",
+  "leapseconds",
+  "tzdata.zi",
+  "zone.tab",
+  "zone1970.tab"
 };
 
 
@@ -2590,21 +2594,21 @@
         else
         {
           /*
-            Some systems (like debian, opensuse etc) have description
-            files (.tab).  We skip these silently if verbose is > 0
+            Some systems (like Debian, openSUSE, etc) have non-timezone
+            files.  We skip these silently unless verbose > 0.
           */
-          const char *current_ext= fn_ext(fullname);
-          my_bool known_ext= 0;
+          const char *current_basename= my_basename(fullname);
+          my_bool known_basename= 0;
 
-          for (const char **ext= known_extensions ; *ext ; ext++)
+          for (const char **basename= known_basenames ; *basename ; basename++)
           {
-            if (!strcmp(*ext, current_ext))
+            if (!strcmp(*basename, current_basename))
             {
-              known_ext= 1;
+              known_basename= 1;
               break;
             }
           }
-          if (verbose > 0 || !known_ext)
+          if (verbose > 0 || !known_basename)
           {
             fflush(stdout);
             fprintf(stderr,