Unbuffered queries save memory

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

diff --git a/adminer/include/export.inc.php b/adminer/include/export.inc.php
index 2cdced7cb9df96ed034b04fa05caee842c1be1c7..19866c160f99e50cdf3a7ad585d660448bfbf872 100644 (file)
--- a/adminer/include/export.inc.php
+++ b/adminer/include/export.inc.php
@@ -100,7 +100,7 @@ function dump_data($table, $style, $select = "") {
                if ($_POST["format"] != "csv" && $style == "TRUNCATE+INSERT") {
                        dump("TRUNCATE " . idf_escape($table) . ";\n");
                }
-               $result = $dbh->query(($select ? $select : "SELECT * FROM " . idf_escape($table))); //! enum and set as numbers, microtime
+               $result = $dbh->query(($select ? $select : "SELECT * FROM " . idf_escape($table)), 1); // 1 - MYSQLI_USE_RESULT //! enum and set as numbers, microtime
                if ($result) {
                        $fields = fields($table);
                        $insert = "";

diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index 84a984c7f9ff73af6476bc64a03395b0e2824d8c..0defded2683cf9d19b3989545d8ffeb40cd31509 100644 (file)
--- a/adminer/include/mysql.inc.php
+++ b/adminer/include/mysql.inc.php
@@ -61,8 +61,8 @@ if (extension_loaded("mysqli")) {
                        return mysql_select_db($database, $this->_link);
                }
                
-               function query($query) {
-                       $result = @mysql_query($query, $this->_link); // mute mysql.trace_mode
+               function query($query, $unbuffered = false) {
+                       $result = @($unbuffered ? mysql_unbuffered_query($query, $this->_link) : mysql_query($query, $this->_link)); // @ - mute mysql.trace_mode
                        if (!$result) {
                                $this->error = mysql_error($this->_link);
                                return false;

diff --git a/adminer/include/pdo.inc.php b/adminer/include/pdo.inc.php
index 80e239ff335b7411f97206f7ea5eb0555467aac1..2b6e451e179964eac0a20f40940d1a10f52d0608 100644 (file)
--- 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) {
+               function query($query) { // $unbuffered is not supported
                        $result = parent::query($query);
                        if (!$result) {
                                $errorInfo = $this->errorInfo();