Merge commit '2ee0e4ed0e86572f15764fea6ef37bdaf546e6ee'

1 files changed, 5 insertions, 1 deletions

diff --git a/sql.php b/sql.php
index 6e22d62b0e..6e6257b732 100644
--- a/sql.php
+++ b/sql.php
@@ -141,11 +141,15 @@ require_once 'libraries/parse_analyze.lib.php';
 list(
     $analyzed_sql_results,
     $db,
-    $table
+    $table_from_sql
 ) = PMA_parseAnalyze($sql_query, $db);
 // @todo: possibly refactor
 extract($analyzed_sql_results);
 
+if ($table != $table_from_sql && !empty($table_from_sql)) {
+    $table = $table_from_sql;
+}
+
 
 /**
  * Check rights in case of DROP DATABASE