From 4d29e42f99f7a9b703be4764034d6794464dad26 Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.net>
Date: Sun, 11 Jan 2015 09:40:09 -0500
Subject: [PATCH] Merge remote-tracking branch 'ispc3master/master'

---
 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