kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'stable-3.1' of github.com:AlternC/AlternC into stable-3.1

This commit is contained in:
Benjamin Sonntag 2016-01-25 17:15:17 +01:00
parent 77199b9788 b379d2cb34
commit 7bdc9152bc
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
install/mysql.sql
View File

@ -687,7 +687,8 @@ CREATE TABLE IF NOT EXISTS `default_subdomains` (
`domain_type_parameter` varchar(255) NOT NULL,
`concerned` enum('BOTH','MAIN','SLAVE') NOT NULL DEFAULT 'MAIN',
`enabled` boolean not null default true,
PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
UNIQUE KEY `unique_row` (`sub`,`domain_type`,`domain_type_parameter`,`concerned`)
) ENGINE=MyISAM COMMENT='Contains the defaults subdomains created on domains creation';
INSERT IGNORE INTO `default_subdomains` (`sub`, `domain_type`, `domain_type_parameter`, `concerned`) VALUES

3
install/upgrades/3.0.0~1.sql
View File

@ -204,6 +204,9 @@ UPDATE domaines_type SET create_tmpdir=true, create_targetdir=true WHERE target=
ALTER IGNORE TABLE domaines MODIFY domaine VARCHAR(255);
ALTER IGNORE TABLE sub_domaines MODIFY domaine VARCHAR(255);
-- Should lthe default_subdomains table already exists, prevent the following INSERT INTO to double the entries
ALTER TABLE `default_subdomains` ADD UNIQUE KEY `unique_row` (`sub`,`domain_type`,`domain_type_parameter`,`concerned`);
-- Defaults subdomains to create when a domain is added
CREATE TABLE IF NOT EXISTS `default_subdomains` (
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,