bug #4780 Notice when timestamp column does not have default value

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-02-26 10:59:36 +05:30
parent f2e409ed0b
commit 04665a72c9
2 changed files with 3 additions and 1 deletions

View File

@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
- bug #4753 Normal field and multi-line field have different margins
- bug #4760 Cannot re-import settings from local storage
- bug #4778 SQL error when database list is sorted by additional columns
- bug #4780 Notice when timestamp column does not have default value
4.3.10.0 (2015-02-20)
- bug Undefined index navwork

View File

@ -3701,7 +3701,8 @@ class PMA_Util
&& empty($field['Default'])
&& empty($data)
&& ! isset($analyzed_sql_field_array['on_update_current_timestamp'])
&& ($analyzed_sql_field_array['default_value'] != 'NULL')
&& ! (isset($analyzed_sql_field_array['default_value'])
&& $analyzed_sql_field_array['default_value'] == 'NULL')
) {
$default_function = $cfg['DefaultFunctions']['first_timestamp'];
}