From 3535d0a3258446f89fb6604a5150bbb4fe3c2b1d Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Fri, 25 Mar 2011 12:50:21 +0100
Subject: [PATCH] Parse comment before delimiter

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

diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index 5451f159..9b874afa 100644
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -38,7 +38,7 @@ if (!$error && $_POST) {
 				$history[] = $q;
 			}
 		}
-		$space = "(\\s|/\\*.*\\*/|(#|-- )[^\n]*\n|--\n)";
+		$space = "(?:\\s|/\\*.*\\*/|(?:#|-- )[^\n]*\n|--\n)";
 		if (!ini_bool("session.use_cookies")) {
 			session_write_close();
 		}
@@ -57,7 +57,7 @@ if (!$error && $_POST) {
 		$dump_format = $adminer->dumpFormat();
 		unset($dump_format["sql"]);
 		while ($query != "") {
-			if (!$offset && $jush == "sql" && preg_match('~^\\s*DELIMITER\\s+(.+)~i', $query, $match)) {
+			if (!$offset && $jush == "sql" && preg_match("~^$space*DELIMITER\\s+(.+)~i", $query, $match)) {
 				$delimiter = $match[1];
 				$query = substr($query, strlen($match[0]));
 			} else {
@@ -93,7 +93,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)) {
-							if (is_object($connection2) && preg_match("~^$space*(USE)\\b~isU", $q)) {
+							if (is_object($connection2) && preg_match("~^$space*USE\\b~isU", $q)) {
 								$connection2->query($q);
 							}
 							do {