From 690f8f509c54f7ada5d4ee41d27f1d332bbba7e4 Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Fri, 28 Aug 2009 15:29:42 +0000 Subject: [PATCH] Unbuffered queries save memory git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1038 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- adminer/include/export.inc.php | 2 +- adminer/include/mysql.inc.php | 4 ++-- adminer/include/pdo.inc.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adminer/include/export.inc.php b/adminer/include/export.inc.php index 2cdced7c..19866c16 100644 --- 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 84a984c7..0defded2 100644 --- 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 80e239ff..2b6e451e 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) { + function query($query) { // $unbuffered is not supported $result = parent::query($query); if (!$result) { $errorInfo = $this->errorInfo();