Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2015-07-24 08:50:49 +0300
committerMadhura Jayaratne <madhura.cj@gmail.com>2015-07-24 08:50:49 +0300
commit50d7c81e7dde3f62a11b2d2ccad7b68c22bbca28 (patch)
treeb4a7cfdadd33c2f2142efdd485ad4284fdf41cd3 /sql
parent431c504640baaeea7ca4baab3c1385da7ce7ae42 (diff)
Fix #1817 Creating configuration storage tables fail in MySQL 5.7
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Diffstat (limited to 'sql')
-rw-r--r--sql/create_tables.sql4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/create_tables.sql b/sql/create_tables.sql
index fb1894a8e4..f906115fbe 100644
--- a/sql/create_tables.sql
+++ b/sql/create_tables.sql
@@ -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`)
)