The branch, master has been updated
via e93a16f5a3b369c3d7171271f822a527bc496725 (commit)
via 81a338db80012ca67009ac780ee1bffe38dd1ad1 (commit)
via bbf5941c21eb5a28bc0b0b5c8b3849bb059a5baa (commit)
from 63096a264e6e63deff7fb0ae6ce454087d11a693 (commit)
- Log -----------------------------------------------------------------
commit e93a16f5a3b369c3d7171271f822a527bc496725
Merge: 63096a264e6e63deff7fb0ae6ce454087d11a693 81a338db80012ca67009ac780ee1bffe38dd1ad1
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Nov 4 06:35:35 2010 -0400
fix merge conflicts
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
tbl_change.php | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 40b269b..c5e8414 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -121,6 +121,7 @@
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 41e8230..bee7017 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -542,6 +542,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
Show replies by date