From ea707775d2b05ef3a40a1aeca870411203907d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 30 Sep 2005 18:38:14 +0000
Subject: [PATCH] Fix auto increment export (bug #1309257).

---
 ChangeLog                        | 5 +++++
 db_operations.php                | 2 +-
 libraries/display_export.lib.php | 2 +-
 libraries/export/sql.php         | 2 +-
 tbl_properties_operations.php    | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 06d734a86..dafbf9ba2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-09-30 Michal Čihař  <michal@cihar.com>
+    * libraries/display_export.lib.php, libraries/export/sql.php,
+      db_operations.php, tbl_properties_operations.php: Fix auto increment
+      export (bug #1309257).
+
 2005-09-28 Marc Delisle  <lem9@users.sourceforge.net>
     * tbl_alter.php, libraries/common.lib.php, /relation.lib.php:
       bug #1262250, cannot change ENUM default value to empty
diff --git a/db_operations.php b/db_operations.php
index aeda365c7..eb87c4c4f 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -246,7 +246,7 @@ if (!$is_information_schema) {
 
                 <input type="checkbox" name="create_database_before_copying" value="1" id="checkbox_create_database_before_copying" style="vertical-align: middle" checked="checked" /><label for="checkbox_create_database_before_copying"><?php echo $strCreateDatabaseBeforeCopying; ?></label><br />
                 <input type="checkbox" name="drop_if_exists" value="true" id="checkbox_drop" style="vertical-align: middle" /><label for="checkbox_drop"><?php echo $strStrucDrop; ?></label>&nbsp;&nbsp;<br />
-                <input type="checkbox" name="auto_increment" value="1" id="checkbox_auto_increment" style="vertical-align: middle" /><label for="checkbox_auto_increment"><?php echo $strAddAutoIncrement; ?></label><br />
+                <input type="checkbox" name="sql_auto_increment" value="1" id="checkbox_auto_increment" style="vertical-align: middle" /><label for="checkbox_auto_increment"><?php echo $strAddAutoIncrement; ?></label><br />
                 <input type="checkbox" name="constraints" value="1" id="checkbox_constraints" style="vertical-align: middle" /><label for="checkbox_constraints"><?php echo $strAddConstraints; ?></label><br />
                 <?php
                     if (isset($_COOKIE) && isset($_COOKIE['pma_switch_to_new']) && $_COOKIE['pma_switch_to_new'] == 'true') {
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index b328bca94..279dacae2 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -230,7 +230,7 @@ if (!$hide_structure) { ?>
 
                         &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="if_not_exists" value="1" id="checkbox_dump_if_not_exists" <?php PMA_exportCheckboxCheck('sql_if_not_exists'); ?> style="vertical-align: middle" /><label for="checkbox_dump_if_not_exists"><?php echo $strAddIfNotExists; ?></label><br />
 
-                        &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="auto_increment" value="1" id="checkbox_auto_increment" <?php PMA_exportCheckboxCheck('sql_auto_increment'); ?> style="vertical-align: middle" /><label for="checkbox_auto_increment"><?php echo $strAddAutoIncrement; ?></label><br />
+                        &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="sql_auto_increment" value="1" id="checkbox_auto_increment" <?php PMA_exportCheckboxCheck('sql_auto_increment'); ?> style="vertical-align: middle" /><label for="checkbox_auto_increment"><?php echo $strAddAutoIncrement; ?></label><br />
 
                         &nbsp;&nbsp;&nbsp;&nbsp;<input type="checkbox" name="use_backquotes" value="1" id="checkbox_dump_use_backquotes" <?php PMA_exportCheckboxCheck('sql_backquotes'); ?> style="vertical-align: middle" /><label for="checkbox_dump_use_backquotes"><?php echo $strUseBackquotes; ?></label><br />
 
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index 3414765bb..3f3a416ee 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -187,7 +187,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false)
     if ($result != FALSE) {
         if (PMA_DBI_num_rows($result) > 0) {
             $tmpres        = PMA_DBI_fetch_assoc($result);
-            if (isset($GLOBALS['auto_increment']) && !empty($tmpres['Auto_increment'])) {
+            if (isset($GLOBALS['sql_auto_increment']) && !empty($tmpres['Auto_increment'])) {
                 $auto_increment .= ' AUTO_INCREMENT=' . $tmpres['Auto_increment'] . ' ';
             }
 
diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php
index 5988c7dc3..d70ce6558 100644
--- a/tbl_properties_operations.php
+++ b/tbl_properties_operations.php
@@ -223,7 +223,7 @@ for ($i = 0; $i < $num_dbs; $i++) {
                 <input type="radio" name="what" value="dataonly" id="radio_copy_dataonly" style="vertical-align: middle" /><label for="radio_copy_dataonly"><?php echo $strDataOnly; ?></label>&nbsp;&nbsp;<br />
 
                 <input type="checkbox" name="drop_if_exists" value="true" id="checkbox_drop" style="vertical-align: middle" /><label for="checkbox_drop"><?php echo $strStrucDrop; ?></label>&nbsp;&nbsp;<br />
-                <input type="checkbox" name="auto_increment" value="1" id="checkbox_auto_increment" style="vertical-align: middle" /><label for="checkbox_auto_increment"><?php echo $strAddAutoIncrement; ?></label><br />
+                <input type="checkbox" name="sql_auto_increment" value="1" id="checkbox_auto_increment" style="vertical-align: middle" /><label for="checkbox_auto_increment"><?php echo $strAddAutoIncrement; ?></label><br />
                 <?php
                     // display "Add constraints" choice only if there are
                     // foreign keys