From: Jakub Vrana <jakub@vrana.cz>
Date: Fri, 26 Nov 2010 10:09:50 +0000 (+0100)
Subject: Respect error in EXPLAIN (bug #3118536)
X-Git-Tag: v3.2.0~123
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=e197ccd43395307e903904953da86f9b49f7fc4c;p=adminer.git

Respect error in EXPLAIN (bug #3118536)
---

diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index 7c90d582..81be8728 100644
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -109,11 +109,11 @@ if (!$error && $_POST) {
 									}
 									select($result, $connection2);
 									echo "<p>" . ($result->num_rows ? lang('%d row(s)', $result->num_rows) : "") . $time;
-									if ($connection2 && preg_match("~^($space|\\()*SELECT\\b~isU", $q)) {
+									if ($connection2 && preg_match("~^($space|\\()*SELECT\\b~isU", $q) && ($explain = explain($connection2, $q))) {
 										$id = "explain-$commands";
 										echo ", <a href='#$id' onclick=\"return !toggle('$id');\">EXPLAIN</a>\n";
 										echo "<div id='$id' class='hidden'>\n";
-										select(explain($connection2, $q));
+										select($explain);
 										echo "</div>\n";
 									}
 								}