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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-07-24 07:52:17 +02:00
commit 9ca619f621
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -79,6 +79,7 @@ phpMyAdmin - ChangeLog
+ rfe Support virtual columns in MySQL 5.7.5+
+ rfe #1517 Support for virtual/persistent columns in MariaDB
- bug #4984 Undefined <feature>work upon upgrade to new version
- issue #1817 Creating configuration storage tables fail in MySQL 5.7
4.4.13.0 (not yet released)
- issue #1808 "Improve table structure" generates invalid SQL

4
sql/create_tables.sql
View File

@ -81,7 +81,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 NOT NULL,
`timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP,
`sqlquery` text NOT NULL,
PRIMARY KEY (`id`),
KEY `username` (`username`,`db`,`table`,`timevalue`)
@ -231,7 +231,7 @@ CREATE TABLE IF NOT EXISTS `pma__tracking` (
CREATE TABLE IF NOT EXISTS `pma__userconfig` (
`username` varchar(64) NOT NULL,
`timevalue` timestamp NOT NULL,
`timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`config_data` text NOT NULL,
PRIMARY KEY (`username`)
)