Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog
 3.5.1.0 (not yet released)
 - bug #3510784 [edit] Limit clause ignored when sort order is remembered
 - bug #3511471 [interface] View name not seen in navi panel (MySQL 5.1)
+- bug #3512916 [display] Right frame reloads after displaying SQL result(zero rows)
 
 3.5.0.0 (not yet released)
 + rfe #2021981 [interface] Add support for mass prefix change.

libraries/parse_analyze.lib.php

@@ -53,7 +53,7 @@ if ($is_select) {
         $db = $prev_db;
     }
     // Nijel: don't change reload, if we already decided to reload in import
-    if (empty($reload)) {
+    if (empty($reload) && empty($GLOBALS['ajax_request'])) {
         $reload  = ($db == $prev_db) ? 0 : 1;
     }
 }