[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_5RC1-5-g368cf8d

Marc Delisle lem9 at users.sourceforge.net
Sun Jul 25 13:54:07 CEST 2010


The branch, QA_3_3 has been updated
       via  368cf8d74f77cf71d279c1c87f4feac4c862c44f (commit)
       via  58021a8e6c5c9fe7963864480c365f8f49f390b4 (commit)
      from  8b592a365bc46992223ea041dce3e992dba3c839 (commit)


- Log -----------------------------------------------------------------
commit 368cf8d74f77cf71d279c1c87f4feac4c862c44f
Merge: 8b592a365bc46992223ea041dce3e992dba3c839 58021a8e6c5c9fe7963864480c365f8f49f390b4
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Jul 25 07:53:41 2010 -0400

    Merge branch 'MAINT_3_3_5' into QA_3_3

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                 |    1 +
 scripts/create_tables.sql |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5323907..fc317e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug [export] CSV for MS Excel (Windows) should have semi-colon as separator
 - [core] Update library PHPExcel to version 1.7.3c
 - bug #2994885, bug #3029168 [import] Convert Excel column name correctly
+- bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql
 
 3.3.4.0 (2010-06-28)
 - bug #2996161 [import] properly escape import value
diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql
index bcb8b35..e4d0fc8 100644
--- a/scripts/create_tables.sql
+++ b/scripts/create_tables.sql
@@ -80,7 +80,7 @@ CREATE TABLE IF NOT EXISTS `pma_history` (
   `username` varchar(64) NOT NULL default '',
   `db` varchar(64) NOT NULL default '',
   `table` varchar(64) NOT NULL default '',
-  `timevalue` timestamp(14) NOT NULL,
+  `timevalue` timestamp NOT NULL,
   `sqlquery` text NOT NULL,
   PRIMARY KEY  (`id`),
   KEY `username` (`username`,`db`,`table`,`timevalue`)


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list