From 8c10fc05f4cfa9fdd1a36c7727b0997a5de78e86 Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Fri, 26 Nov 2010 14:13:38 +0100
Subject: [PATCH] Don't print error message with no error (bug #3118538)

---
 adminer/sql.inc.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index 81be8728..e630c3c7 100644
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -78,14 +78,7 @@ if (!$error && $_POST) {
 						}
 						$start = explode(" ", microtime()); // microtime(true) is available since PHP 5
 						//! don't allow changing of character_set_results, convert encoding of displayed query
-						if (!$connection->multi_query($q)) {
-							echo ($_POST["only_errors"] ? $print : "");
-							echo "<p class='error'>" . lang('Error in query') . ": " . error() . "\n";
-							$errors[] = " <a href='#sql-$commands'>$commands</a>";
-							if ($_POST["error_stops"]) {
-								break;
-							}
-						} else {
+						if ($connection->multi_query($q)) {
 							if (is_object($connection2) && preg_match("~^$space*(USE)\\b~isU", $q)) {
 								$connection2->query($q);
 							}
@@ -119,6 +112,13 @@ if (!$error && $_POST) {
 								}
 								$start = $end;
 							} while ($connection->next_result());
+						} elseif ($connection->error) {
+							echo ($_POST["only_errors"] ? $print : "");
+							echo "<p class='error'>" . lang('Error in query') . ": " . error() . "\n";
+							$errors[] = " <a href='#sql-$commands'>$commands</a>";
+							if ($_POST["error_stops"]) {
+								break;
+							}
 						}
 						$query = substr($query, $offset);
 						$offset = 0;