[Phpmyadmin-git] [SCM] phpMyAdmin branch, TESTING, updated. RELEASE_3_3_5-8-gb404588 - Git

26 Jul 2010

The branch, TESTING has been updated
       via  b40458875721cefa2ee16241e7a657463452999d (commit)
       via  f3f073a0ba8fe8e3857d98a84627bda53d50dc5e (commit)
       via  58021a8e6c5c9fe7963864480c365f8f49f390b4 (commit)
      from  15ba6003dcfa87bacc7100c7e0409ef1d525ce68 (commit)
- Log -----------------------------------------------------------------
commit b40458875721cefa2ee16241e7a657463452999d
Merge: 15ba6003dcfa87bacc7100c7e0409ef1d525ce68 f3f073a0ba8fe8e3857d98a84627bda53d50dc5e
Author: Marc Delisle marc@infomarc.info
Date:   Mon Jul 26 12:31:37 2010 -0400
Merge branch 'MAINT_3_3_5' into TESTING
-----------------------------------------------------------------------
Summary of changes:
 ChangeLog                  |    3 ++-
 Documentation.html         |    4 ++--
 README                     |    4 ++--
 libraries/Config.class.php |    2 +-
 scripts/create_tables.sql  |    2 +-
 translators.html           |    4 ++--
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2b0c93f..53adf96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/C... $
-3.3.5.0 (not yet released)
+3.3.5.0 (2010-07-26)
 - patch #2932113 [information_schema] Slow export when having lots of
   databases, thanks to Stéphane Pontier - shadow_walker
 - bug #3022705 [import] Import button does not work in Catalan when there
@@ -20,6 +20,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/Documentation.html b/Documentation.html
index 9053c48..100b9ae 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.3.5-rc1 - Documentation</title>
+    <title>phpMyAdmin 3.3.5 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
@@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.3.5-rc1 
+        3.3.5 
         Documentation
     </h1>
 </div>
diff --git a/README b/README
index 18a6bef..279f66f 100644
--- a/README
+++ b/README
@@ -5,8 +5,8 @@ phpMyAdmin - Readme
A set of PHP-scripts to manage MySQL over the web.
-  Version 3.3.5-rc1
-  -----------------
+  Version 3.3.5
+  -------------
   http://www.phpmyadmin.net/
Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com>
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 4931858..e73de8b 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -92,7 +92,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.3.5-rc1');
+        $this->set('PMA_VERSION', '3.3.5');
         /**
          * @deprecated
          */
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`)
diff --git a/translators.html b/translators.html
index 407c759..d847a9e 100644
--- a/translators.html
+++ b/translators.html
@@ -11,7 +11,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.3.5-rc1 - Official translators</title>
+    <title>phpMyAdmin 3.3.5 - Official translators</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
@@ -19,7 +19,7 @@
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.3.5-rc1 
+        3.3.5 
         official translators list
     </h1>
 </div>
hooks/post-receive
-- 
phpMyAdmin


    