Display SQL info

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

diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index e3b4b8cf588307d6bec5d329d2a87b7b577b2343..b578de522e9e8c013ed3fe27d26f66009aaaf322 100644 (file)
--- a/adminer/include/mysql.inc.php
+++ b/adminer/include/mysql.inc.php
@@ -68,6 +68,7 @@ if (extension_loaded("mysqli")) {
                                return false;
                        } elseif ($result === true) {
                                $this->affected_rows = mysql_affected_rows($this->_link);
+                               $this->info = mysql_info($this->_link);
                                return true;
                        }
                        return new Min_Result($result);

diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index b666be0d5af1205d8af68d358d3b65a1f5aefa70..61d309d1957dfef207a20ffdab0d2754aeedae92 100644 (file)
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -87,7 +87,7 @@ if (!$error && $_POST) {
                                                                        if (preg_match("~^$space*$alter_database", $query)) {
                                                                                $databases = null; // clear cache
                                                                        }
-                                                                       echo "<p class='message'>" . lang('Query executed OK, %d row(s) affected.', $connection->affected_rows) . "\n";
+                                                                       echo "<p class='message'>" . lang('Query executed OK, %d row(s) affected.', $connection->affected_rows) . "<br>" . h($connection->info) . "\n";
                                                                }
                                                                unset($result); // free resultset
                                                        } while ($connection->next_result());

diff --git a/changes.txt b/changes.txt
index 503d14b206d41610f7cdd8c9ac1eb251c86e0d24..95c378d6f62901102f3df53258284348c84f352c 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,6 @@
 Adminer 2.2.2-dev:
 Add Delete button to Edit page (regression from 2.0.0)
+Simplify SQL syntax error message
 
 Adminer 2.2.1 (released 2009-11-26):
 Highlight current links