From 9893e01f6de6b225bbc84bff49ec673164035892 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 03 Feb 2014 14:11:26 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'
---
install/sql/ispconfig3.sql | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 81a4cf3..9c8f04e 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1486,10 +1486,10 @@
--
CREATE TABLE `sys_config` (
- `config_id` int(11) unsigned NOT NULL,
`group` varchar(64) NOT NULL,
`name` varchar(64) NOT NULL,
- `value` varchar(255) NOT NULL
+ `value` varchar(255) NOT NULL,
+ PRIMARY KEY (`group`, `name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2280,7 +2280,7 @@
-- Dumping data for table `sys_config`
--
-INSERT INTO sys_config VALUES ('1','db','db_version','3.0.5.3');
-INSERT INTO sys_config VALUES ('2','interface','session_timeout','0');
+INSERT INTO sys_config VALUES ('db','db_version','3.0.5.3');
+INSERT INTO sys_config VALUES ('interface','session_timeout','0');
SET FOREIGN_KEY_CHECKS = 1;
--
Gitblit v1.9.1