diff --git a/ChangeLog b/ChangeLog
index 4ca1f38a3..047adb695 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@ $Source$
       and inserted rows count (bug #1475765).
     * libraries/common.lib.php: Better detection of duplicate rows (bug
       #1477500).
+    * libraries/display_tbl.lib.php: Do not check for VIEW if no table name
+      (eg. SELECT 1) (bug #1473484).
 
 2006-04-26 Michal Čihař  <michal@cihar.com>
     * libraries/plugin_interface.lib.php:
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 5462c1468..5625fa4a6 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1739,7 +1739,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
                         ? $total - 1
                         : $pos_next - 1;
         PMA_showMessage($GLOBALS['strShowingRecords'] . " $pos - $last_shown_rec (" . PMA_formatNumber($total, 0) . ' ' . $GLOBALS['strTotal'] . $selectstring . ', ' . sprintf($GLOBALS['strQueryTime'], $GLOBALS['querytime']) . ')');
-        if (PMA_Table::isView($db, $table) && $total ==  $GLOBALS['cfg']['MaxExactCount']) {
+        if (isset($table) && PMA_Table::isView($db, $table) && $total ==  $GLOBALS['cfg']['MaxExactCount']) {
             echo '<div class="notice">' . "\n";
             echo PMA_sanitize(sprintf($GLOBALS['strViewMaxExactCount'], PMA_formatNumber($GLOBALS['cfg']['MaxExactCount'], 0), '[a@./Documentation.html#cfg_MaxExactCount@_blank]', '[/a]')) . "\n";
             echo '</div>' . "\n";