diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index ac78e6f6..eaf98512 100644
--- a/adminer/include/mysql.inc.php
+++ b/adminer/include/mysql.inc.php
@@ -132,6 +132,11 @@ if (extension_loaded("mysqli")) {
 			$this->server_info = $this->result($this->query("SELECT VERSION()"));
 			return true;
 		}
+		
+		function query($query, $unbuffered = false) {
+			$this->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, !$unbuffered);
+			return parent::query($query, $unbuffered);
+		}
 	}
 	
 } else {
diff --git a/adminer/include/pdo.inc.php b/adminer/include/pdo.inc.php
index 2b6e451e..f62c7cd2 100644
--- a/adminer/include/pdo.inc.php
+++ b/adminer/include/pdo.inc.php
@@ -19,7 +19,7 @@ if (extension_loaded('pdo')) {
 			return $this->query("USE " . idf_escape($database));
 		}
 		
-		function query($query) { // $unbuffered is not supported
+		function query($query, $unbuffered = false) {
 			$result = parent::query($query);
 			if (!$result) {
 				$errorInfo = $this->errorInfo();