Merge remote-tracking branch 'origin/master'

phpmyadmin · Sep 23, 2015 · 8813154 · 8813154
2 parents 82dc704 + 91337a7
commit 8813154
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog
 - issue #11486 Server variable edition in ANSI_QUOTES sql_mode: losing current value
 - issue #11491 Propose table structure broken
 - issue #11464 phpMyAdmin suggests upgrading to newer version not usable on that system
+- issue #11492 AUTO_INCREMENT statements are partly missing from exports
 
 4.5.0.0 (2015-09-23)
 + rfe          Pagination for GIS visualization

diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php
@@ -1662,13 +1662,12 @@ public function getTableDef(
                 }
 
                 // Generating auto-increment-related query.
-                if ((! empty($auto_increment))
-                    && ($update_indexes_increments)
-                    && ($statement->entityOptions->has('AUTO_INCREMENT') !== false)
-                ) {
+                if ((! empty($auto_increment)) && ($update_indexes_increments)) {
                     $sql_auto_increments_query = $alter_header . $crlf . '  MODIFY '
                         . implode(',' . $crlf . '  MODIFY ', $auto_increment);
-                    if (isset($GLOBALS['sql_auto_increment'])) {
+                    if (isset($GLOBALS['sql_auto_increment'])
+                        && ($statement->entityOptions->has('AUTO_INCREMENT') !== false)
+                    ) {
                         $sql_auto_increments_query .= ', AUTO_INCREMENT='
                             . $statement->entityOptions->has('AUTO_INCREMENT');
                     }