From 81a338db80012ca67009ac780ee1bffe38dd1ad1 Mon Sep 17 00:00:00 2001
From: jirand <jirand@users.sourceforge.net>
Date: Thu, 4 Nov 2010 06:27:31 -0400
Subject: [PATCH] patch #3101490 Default function for TIMESTAMP

---
 ChangeLog      | 1 +
 tbl_change.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 48081600b..1a4f318f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 
 3.3.9.0 (not yet released)
 - bug [doc] Fix references to MySQL doc
+- patch #3101490 Default function for TIMESTAMP, thanks to jirand - jirand
 
 3.3.8.0 (2010-10-25)
 - bug #3059311 [import] BIGINT field type added to table analysis
diff --git a/tbl_change.php b/tbl_change.php
index f419bb158..cd4fff05d 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -532,6 +532,7 @@ foreach ($rows as $row_id => $vrow) {
 
                 if ($field['True_Type'] == 'timestamp'
                   && empty($field['Default'])
+                  && empty($data)
                   && ! isset($analyzed_sql[0]['create_table_fields'][$field['Field']]['on_update_current_timestamp'])) {
                     $default_function = $cfg['DefaultFunctions']['first_timestamp'];
                 }