fix merge conflicts

2010-11-04 06:35:35 -04:00
parent 63096a264e 81a338db80
commit e93a16f5a3
2 changed files with 2 additions and 0 deletions
--- a/1
+++ b/1
@@ -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
--- 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'];
                }