From 341ef7175af7c8f21d27262b58da8f5bc2c06ef0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 08 Jul 2014 08:44:59 -0400
Subject: [PATCH] Merge branch 'master_fixes' into 'master'
---
install/sql/incremental/upd_0050.sql | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/install/sql/incremental/upd_0050.sql b/install/sql/incremental/upd_0050.sql
new file mode 100644
index 0000000..bc31868
--- /dev/null
+++ b/install/sql/incremental/upd_0050.sql
@@ -0,0 +1,19 @@
+CREATE TABLE IF NOT EXISTS `dns_slave` (
+ `id` int(10) unsigned NOT NULL auto_increment,
+ `sys_userid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_groupid` int(11) unsigned NOT NULL DEFAULT '0',
+ `sys_perm_user` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
+ `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
+ `server_id` int(11) NOT NULL default '1',
+ `origin` varchar(255) NOT NULL DEFAULT '',
+ `ns` varchar(255) NOT NULL DEFAULT '',
+ `active` enum('N','Y') NOT NULL DEFAULT 'N',
+ `xfer` varchar(255) NOT NULL DEFAULT '',
+ PRIMARY KEY (`id`),
+ KEY `origin` (`origin`),
+ KEY `active` (`active`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+
+ALTER TABLE `dns_slave` DROP INDEX `origin`;
+ALTER TABLE `dns_slave` ADD CONSTRAINT `slave` UNIQUE (`origin`,`server_id`);
\ No newline at end of file
--
Gitblit v1.9.1