nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MAINT_3_3_5' into QA_3_3

Browse Source
This commit is contained in:
Marc Delisle
2010-07-25 07:53:41 -04:00
parent 8b592a365b 58021a8e6c
commit 368cf8d74f
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -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 - bug [export] CSV for MS Excel (Windows) should have semi-colon as separator
- [core] Update library PHPExcel to version 1.7.3c - [core] Update library PHPExcel to version 1.7.3c
- bug #2994885, bug #3029168 [import] Convert Excel column name correctly - 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) 3.3.4.0 (2010-06-28)
- bug #2996161 [import] properly escape import value - bug #2996161 [import] properly escape import value

2
scripts/create_tables.sql
View File

@@ -80,7 +80,7 @@ CREATE TABLE IF NOT EXISTS `pma_history` (
`username` varchar(64) NOT NULL default '', `username` varchar(64) NOT NULL default '',
`db` varchar(64) NOT NULL default '', `db` varchar(64) NOT NULL default '',
`table` varchar(64) NOT NULL default '', `table` varchar(64) NOT NULL default '',
`timevalue` timestamp(14) NOT NULL, `timevalue` timestamp NOT NULL,
`sqlquery` text NOT NULL, `sqlquery` text NOT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
KEY `username` (`username`,`db`,`table`,`timevalue`) KEY `username` (`username`,`db`,`table`,`timevalue`)