diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index a78baa07..f51ea6b2 100644
--- 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 11e81c95..bc13ba87 100644
--- 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() {