Ignore routines errors (bug #3040573)

Report export errors

diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php
index 53acc0919d517f88806739737dd0de41fb812e16..49ec22031b6af05d4894c159959e21b8a98e4b7c 100644 (file)
--- a/adminer/dump.inc.php
+++ b/adminer/dump.inc.php
@@ -46,9 +46,13 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
                                if ($_POST["routines"]) {
                                        foreach (array("FUNCTION", "PROCEDURE") as $routine) {
                                                $result = $connection->query("SHOW $routine STATUS WHERE Db = " . $connection->quote($db));
-                                               while ($row = $result->fetch_assoc()) {
-                                                       $out .= ($style != 'DROP+CREATE' ? "DROP $routine IF EXISTS " . idf_escape($row["Name"]) . ";;\n" : "")
-                                                       . $connection->result("SHOW CREATE $routine " . idf_escape($row["Name"]), 2) . ";;\n\n";
+                                               if ($result) {
+                                                       while ($row = $result->fetch_assoc()) {
+                                                               $out .= ($style != 'DROP+CREATE' ? "DROP $routine IF EXISTS " . idf_escape($row["Name"]) . ";;\n" : "")
+                                                               . $connection->result("SHOW CREATE $routine " . idf_escape($row["Name"]), 2) . ";;\n\n";
+                                                       }
+                                               } else {
+                                                       echo "-- $connection->error\n\n";
                                                }
                                        }
                                }
@@ -59,6 +63,8 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
                                                        $out .= ($style != 'DROP+CREATE' ? "DROP EVENT IF EXISTS " . idf_escape($row["Name"]) . ";;\n" : "")
                                                        . $connection->result("SHOW CREATE EVENT " . idf_escape($row["Name"]), 3) . ";;\n\n";
                                                }
+                                       } else {
+                                               echo "-- $connection->error\n\n";
                                        }
                                }
                                if ($out) {