From 75124b0197a20947b67b502db19af79d4936f306 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 02 Mar 2016 05:43:11 -0500
Subject: [PATCH] Merge branch 'stable-3.1'

---
 install/sql/incremental/upd_0068.sql |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/install/sql/incremental/upd_0068.sql b/install/sql/incremental/upd_0068.sql
index e7a0018..adce5c2 100644
--- a/install/sql/incremental/upd_0068.sql
+++ b/install/sql/incremental/upd_0068.sql
@@ -1,4 +1,5 @@
-ALTER TABLE  `dbispconfig`.`web_domain` ADD UNIQUE  `serverdomain` (  `server_id` ,  `domain` );
-DROP INDEX rr ON dns_rr;
-ALTER TABLE  `dns_rr` CHANGE  `name`  `name` VARCHAR( 128 ) NOT NULL ;
-CREATE INDEX `rr` ON dns_rr (`zone`,`type`,`name`);
\ No newline at end of file
+ALTER TABLE  `web_domain` ADD UNIQUE  `serverdomain` (  `server_id` ,  `domain` );
+
+ALTER TABLE  `dns_rr` DROP KEY rr,
+	CHANGE  `name`  `name` VARCHAR( 128 ) NOT NULL,
+	ADD KEY `rr` (`zone`,`type`,`name`);

--
Gitblit v1.9.1