From bbf5941c21eb5a28bc0b0b5c8b3849bb059a5baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 3 Nov 2010 11:22:40 +0100 Subject: [PATCH 1/2] Revert this part of fix. --- lang/slovenian-utf-8.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 23af10e8d..08fcfce91 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -8,7 +8,7 @@ $text_dir = 'ltr'; // ('ltr' for left to right, 'rtl' for right to left) $number_thousands_separator = '.'; $number_decimal_separator = ','; // shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa -$byteUnits = array('bajtov', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB'); +$byteUnits = array('B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB'); $day_of_week = array('Ned', 'Pon', 'Tor', 'Sre', 'Čet', 'Pet', 'Sob'); $month = array('Jan', 'Feb', 'Mar', 'Apr', 'Maj', 'Jun', 'Jul', 'Avg', 'Sep', 'Okt', 'Nov', 'Dec'); From 81a338db80012ca67009ac780ee1bffe38dd1ad1 Mon Sep 17 00:00:00 2001 From: jirand Date: Thu, 4 Nov 2010 06:27:31 -0400 Subject: [PATCH 2/2] 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']; }