diff --git a/ChangeLog b/ChangeLog
index 3b41e329e..cb9edcd4b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ $Source$
       #1325651).
     * libraries/string.lib.php: Fix escaping detection on multi byte strings.
     * libraries/sql_query_form.lib.php: No warning if no db defined.
+    * libraries/sqlparser.lib.php: Avoid warning if analyzing failed.
 
 2005-10-17 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * css/phpmyadmin.css.php: border around tabs bug #1326730
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index a47a1ff6b..be74f1d35 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -1189,7 +1189,7 @@ if ($is_minimum_common == FALSE) {
             // for each table_ref alias, put the true name of the table
             // in the corresponding select expressions
 
-            if (isset($current_table_ref) && ($seen_end_of_table_ref || $i == $size-1)) {
+            if (isset($current_table_ref) && ($seen_end_of_table_ref || $i == $size-1) && $subresult != $subresult_empty) {
                 for ($tr=0; $tr <= $current_table_ref; $tr++) {
                     $alias = $subresult['table_ref'][$tr]['table_alias'];
                     $truename = $subresult['table_ref'][$tr]['table_true_name'];