From 78962277620149dbc41e3deb39ead300118618a9 Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Thu, 18 Feb 2010 16:39:00 +0000
Subject: [PATCH] Fix multiquery

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1319 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 adminer/include/mysql.inc.php |  3 ++-
 adminer/include/pdo.inc.php   | 25 +++++++++++++++----------
 todo.txt                      |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index d3a6d129..36499922 100644
--- a/adminer/include/mysql.inc.php
+++ b/adminer/include/mysql.inc.php
@@ -66,7 +66,8 @@ if (extension_loaded("mysqli")) {
 			if (!$result) {
 				$this->error = mysql_error($this->_link);
 				return false;
-			} elseif ($result === true) {
+			}
+			if ($result === true) {
 				$this->affected_rows = mysql_affected_rows($this->_link);
 				$this->info = mysql_info($this->_link);
 				return true;
diff --git a/adminer/include/pdo.inc.php b/adminer/include/pdo.inc.php
index f62c7cd2..5836a23c 100644
--- a/adminer/include/pdo.inc.php
+++ b/adminer/include/pdo.inc.php
@@ -20,27 +20,32 @@ if (extension_loaded('pdo')) {
 		}
 		
 		function query($query, $unbuffered = false) {
-			$result = parent::query($query);
-			if (!$result) {
+			$return = parent::query($query);
+			if (!$return) {
 				$errorInfo = $this->errorInfo();
 				$this->error = $errorInfo[2];
 				return false;
 			}
-			$this->_result = $result;
-			if (!$result->columnCount()) {
-				$this->affected_rows = $result->rowCount();
-				return true;
+			if ($return->columnCount()) {
+				$this->affected_rows = $return->rowCount();
+			} else {
+				$return->num_rows = $return->rowCount(); // is not guaranteed to work with all drivers
 			}
-			$result->num_rows = $result->rowCount(); // is not guaranteed to work with all drivers
-			return $result;
+			return $return;
 		}
 		
 		function multi_query($query) {
-			return $this->query($query);
+			return $this->_result = $this->query($query);
 		}
 		
 		function store_result() {
-			return ($this->_result->columnCount() ? $this->_result : true);
+			$return = &$this->_result;
+			if ($return->columnCount()) {
+				$this->affected_rows = $return->rowCount();
+				return true;
+			}
+			$return->num_rows = $return->rowCount();
+			return $return;
 		}
 		
 		function next_result() {
diff --git a/todo.txt b/todo.txt
index 706e8eb8..3ea2b74a 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,7 +1,6 @@
 MySQL 5 BIT data type
 Transactions in export
 Create view and routine options
-Highlight SQL textarea - may use external CodePress
 Mass editation of individual rows
 Offer enum and set items in search - whisperer
 Variables editation, especially timezone
@@ -9,6 +8,7 @@ Use event $intervals + microseconds in relative date functions
 Optionally check IP address
 Disable spell checking in SQL textareas - spellcheck="false"
 Accept Tab in SQL textareas, Ctrl+Enter to send form
+Highlight SQL textarea, then display query inside textarea in select - may use external CodePress
 Blob download and image display in edit form (important for Editor with hidden fields in select)
 Add title to Logout, edit (in select) and select (in menu) in style "hever"
 ? Column and table names auto-completition in SQL textarea