diff --git a/ChangeLog b/ChangeLog
index 56276bce6..3a3ce32df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2941037 [core] Database structure not sorted by table correctly 
 - bug #2948492 [interface] Slide effect masks some fields on search page
 - bug #2959746 [interface] Unknown table status: TABLE_TYPE 
+- bug #2953050 [export] export VIEW as SQL includes INSERT statement 
 
 3.3.0.0 (not yet released)
 + rfe #2308632 [edit] Use hex for (var)binary fields,
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 24a7ea44e..a7d9e72bb 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -447,7 +447,14 @@ function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = fals
     // Note 2: Instead of array_merge(), simply use the + operator because
     //  array_merge() renumbers numeric keys starting with 0, therefore
     //  we would lose a db name thats consists only of numbers
-    PMA_Table::$cache = PMA_Table::$cache + $tables;
+    foreach($tables as $one_database => $its_tables) {
+        if (isset(PMA_Table::$cache[$one_database])) {
+            PMA_Table::$cache[$one_database] = PMA_Table::$cache[$one_database] + $tables[$one_database];
+        } else {
+            PMA_Table::$cache[$one_database] = $tables[$one_database];
+        }
+    }
+    unset($one_database, $its_tables);
 
     if (! is_array($database)) {
         if (isset($tables[$database])) {