diff --git a/ChangeLog b/ChangeLog
index fcbe3e363..5e425d829 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-01-10 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/sqlparser.lib.php: bug #1394479, problem detecting ending 
+      semi-colon, generates a SHOW KEYS FROM no table name
+
 2006-01-09 Michal Čihař  <michal@cihar.com>
     * import.php: Work on 10MB chunks if no memory limit is set (bug
       #1399477).
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index 04855297b..405242fc3 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -911,7 +911,9 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
 
             // TODO: when we find a UNION, should we split
             // in another subresult?
-            if ($arr[$i]['type'] == 'punct_queryend') {
+            // Note: do not split if this is a punct_queryend for the
+            // first and only query
+            if ($arr[$i]['type'] == 'punct_queryend' && ($i + 1 != $size)) {
                 $result[]  = $subresult;
                 $subresult = $subresult_empty;
                 continue;