From f3777d3dc464db2b9af26a375b10290ffdd4c1ae Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Wed, 7 May 2008 08:53:50 +0000
Subject: [PATCH] fixed bug #1939031 Auto_Increment selected for TimeStamp by
 Default

---
 ChangeLog                        | 2 ++
 libraries/tbl_properties.inc.php | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1a3b964cb..92ec68ce6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,7 +16,9 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #1955386 [session] Overriding session.hash_bits_per_character 
 - [interface] sanitize the table comments in table print view, 
   thanks to Norman Hippert
+- bug #1939031 Auto_Increment selected for TimeStamp by Default
 
+  
 2.11.6.0 (2008-04-29)
 - bug #1903724 [interface] Displaying of very large queries in error message 
 - bug #1905711 [compatibility] Functions deprecated in PHP 5.3: is_a() and
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 80afd04b3..3b1018aa7 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -359,6 +359,9 @@ for ($i = 0 ; $i <= $num_fields; $i++) {
     if ($zerofill) {
         $attribute = 'UNSIGNED ZEROFILL';
     }
+    if (isset($row['Extra']) && $row['Extra'] == 'ON UPDATE CURRENT_TIMESTAMP') {
+        $attribute = 'ON UPDATE CURRENT_TIMESTAMP';
+    }
 
     if (isset($submit_attribute) && $submit_attribute != FALSE) {
         $attribute = $submit_attribute;
@@ -459,7 +462,7 @@ for ($i = 0 ; $i <= $num_fields; $i++) {
 
     $content_cells[$i][$ci] = '<select name="field_extra[]" id="field_' . $i . '_' . ($ci - $ci_offset) . '">';
 
-    if (!isset($row) || empty($row['Extra'])) {
+    if (!isset($row) || empty($row['Extra']) || $row['Extra'] != 'auto_increment') {
         $content_cells[$i][$ci] .= "\n";
         $content_cells[$i][$ci] .= '<option value="">&nbsp;</option>' . "\n";
         $content_cells[$i][$ci] .= '<option value="AUTO_INCREMENT">auto_increment</option>' . "\n";