From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 install/sql/incremental/upd_0078.sql |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/install/sql/incremental/upd_0078.sql b/install/sql/incremental/upd_0078.sql
index 39b8c1c..ea78b87 100644
--- a/install/sql/incremental/upd_0078.sql
+++ b/install/sql/incremental/upd_0078.sql
@@ -1 +1,2 @@
-ALTER TABLE  `web_domain` DROP INDEX `serverdomain`, ADD UNIQUE  `serverdomain` (  `server_id` , `ip_address`, `domain` );
\ No newline at end of file
+ALTER TABLE `dns_rr` CHANGE `data` `data` TEXT NOT NULL DEFAULT '';
+ALTER TABLE  `web_domain` DROP INDEX `serverdomain`, ADD UNIQUE  `serverdomain` (  `server_id` , `ip_address`, `domain` );

--
Gitblit v1.9.1