Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Conflicts: libraries/config.values.php
2010-07-26 20:24:57 +02:00
parent 8d24baad94 41bc587ed4
commit 7db978de3f
158 changed files with 70698 additions and 65430 deletions
--- 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`)