From: Kees Monshouwer <mind04@monshouwer.org>
Date: Wed, 12 Jul 2017 13:20:15 +0000 (+0200)
Subject: update mysql migration schema and change comment type
X-Git-Tag: dnsdist-1.2.0~12^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0829950871c01b89a58befbd19f40f554c4ea95b;p=thirdparty%2Fpdns.git

update mysql migration schema and change comment type
---

diff --git a/modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql b/modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql
index a0987aac5a..c622245442 100644
--- a/modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql
+++ b/modules/gmysqlbackend/3.4.0_to_4.1.0_schema.mysql.sql
@@ -1 +1,18 @@
+ALTER TABLE domains MODIFY account VARCHAR(40) CHARACTER SET 'utf8' DEFAULT NULL;
+ALTER TABLE domains CHARACTER SET 'latin1';
+
 ALTER TABLE records MODIFY id BIGINT AUTO_INCREMENT;
+ALTER TABLE records CHARACTER SET 'latin1';
+
+ALTER TABLE supermasters MODIFY account VARCHAR(40) CHARACTER SET 'utf8' NOT NULL;
+ALTER TABLE supermasters CHARACTER SET 'latin1';
+
+ALTER TABLE comments MODIFY account VARCHAR(40) CHARACTER SET 'utf8' DEFAULT NULL;
+ALTER TABLE comments MODIFY comment TEXT CHARACTER SET 'utf8' NOT NULL;
+ALTER TABLE comments CHARACTER SET 'latin1';
+
+ALTER TABLE domainmetadata CHARACTER SET 'latin1';
+
+ALTER TABLE cryptokeys CHARACTER SET 'latin1';
+
+ALTER TABLE tsigkeys CHARACTER SET 'latin1';
diff --git a/modules/gmysqlbackend/schema.mysql.sql b/modules/gmysqlbackend/schema.mysql.sql
index a9fd9f654f..4dcc71fc43 100644
--- a/modules/gmysqlbackend/schema.mysql.sql
+++ b/modules/gmysqlbackend/schema.mysql.sql
@@ -46,8 +46,8 @@ CREATE TABLE comments (
   name                  VARCHAR(255) NOT NULL,
   type                  VARCHAR(10) NOT NULL,
   modified_at           INT NOT NULL,
-  account               VARCHAR(40) CHARACTER SET 'utf8' NOT NULL,
-  comment               VARCHAR(16000) CHARACTER SET 'utf8' NOT NULL,
+  account               VARCHAR(40) CHARACTER SET 'utf8' DEFAULT NULL,
+  comment               TEXT CHARACTER SET 'utf8' NOT NULL,
   PRIMARY KEY (id)
 ) Engine=InnoDB CHARACTER SET 'latin1';