EXPLAIN for UNIONs

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1266 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/lang/zh-tw.inc.php b/adminer/lang/zh-tw.inc.php
index 84ce6897405b86133c364d38a23028ed89ddbf94..294d5ea243e7b8ad755f3fb3da646ceee7ad05b8 100644 (file)
--- a/adminer/lang/zh-tw.inc.php
+++ b/adminer/lang/zh-tw.inc.php
@@ -225,4 +225,5 @@ $translations = array(
        '%d e-mail(s) have been sent.' => '已發送 %d 封郵件。',
        'Webserver file %s' => '網頁伺服器檔案 %s',
        'File does not exist.' => '檔案不存在',
+       'Item has been deleted.' => '該項目已被刪除',
 );

diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index 2e9fce3bd64e7d7d4a815e4743d22d1d00817efa..1f4a6a335fae3aeb94fad4aa49a0b6d01351c0b2 100644 (file)
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -74,12 +74,12 @@ if (!$error && $_POST) {
                                                                $result = $connection->store_result();
                                                                if (is_object($result)) {
                                                                        select($result, $connection2);
-                                                                       if ($connection2 && preg_match("~^$space*SELECT$space+~isU", $q)) {
+                                                                       if ($connection2 && preg_match("~^($space|\\()*SELECT\\b~isU", $q)) {
                                                                                $id = "explain-$explain";
                                                                                echo "<p>" . ($result->num_rows ? lang('%d row(s)', $result->num_rows) . ", " : "");
                                                                                echo "<a href='#$id' onclick=\"return !toggle('$id');\">EXPLAIN</a>\n";
                                                                                echo "<div id='$id' class='hidden'>\n";
-                                                                               select($connection2->query("EXPLAIN $q"), $connection2);
+                                                                               select($connection2->query("EXPLAIN $q"));
                                                                                echo "</div>\n";
                                                                                $explain++;
                                                                        }