The branch, QA_3_3 has been updated via 81a338db80012ca67009ac780ee1bffe38dd1ad1 (commit) from bbf5941c21eb5a28bc0b0b5c8b3849bb059a5baa (commit) - Log ----------------------------------------------------------------- commit 81a338db80012ca67009ac780ee1bffe38dd1ad1 Author: jirand <jirand@users.sourceforge.net> Date: Thu Nov 4 06:27:31 2010 -0400 patch #3101490 Default function for TIMESTAMP ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + tbl_change.php | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4808160..1a4f318 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 f419bb1..cd4fff0 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']; } hooks/post-receive -- phpMyAdmin