Move SET SQL_QUOTE_SHOW_CREATE to mysql.inc.php

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

diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index a78baa07d1609999926511f0a8cb7192717004e4..f51ea6b2a43d0b28848a0d719850090c98c4a011 100644 (file)
--- a/adminer/include/connect.inc.php
+++ b/adminer/include/connect.inc.php
@@ -19,7 +19,6 @@ function connect_error() {
        page_footer("db");
 }
 
-$dbh->query("SET SQL_QUOTE_SHOW_CREATE=1");
 if (!(strlen($_GET["db"]) ? $dbh->select_db($_GET["db"]) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]) || isset($_GET["processlist"]) || isset($_GET["privileges"]) || isset($_GET["user"]) || isset($_GET["variables"]))) {
        if (strlen($_GET["db"])) {
                unset($_SESSION["databases"][$_GET["server"]]);

diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index 11e81c95ca78562afc5882be9fd7c33e74e05a3e..bc13ba87f3aa700b081f4ece7c688ade2641225c 100644 (file)
--- a/adminer/include/mysql.inc.php
+++ b/adminer/include/mysql.inc.php
@@ -205,7 +205,11 @@ $unsigned = array("unsigned", "zerofill", "unsigned zerofill");
 
 function connect() {
        $dbh = new Min_DB;
-       return ($dbh->connect($_GET["server"], $_SESSION["usernames"][$_GET["server"]], $_SESSION["passwords"][$_GET["server"]]) ? $dbh : $dbh->error);
+       if ($dbh->connect($_GET["server"], $_SESSION["usernames"][$_GET["server"]], $_SESSION["passwords"][$_GET["server"]])) {
+               $dbh->query("SET SQL_QUOTE_SHOW_CREATE=1");
+               return $dbh;
+       }
+       return $dbh->error;
 }
 
 function get_databases() {