From d9459171734cd44f985a46f0c55073213738025f Mon Sep 17 00:00:00 2001 From: Till Brehm <tbrehm@ispconfig.org> Date: Tue, 25 Mar 2014 14:17:43 -0400 Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5 --- install/sql/incremental/upd_0067.sql | 8 ++++---- install/sql/incremental/upd_0026.sql | 2 +- install/sql/incremental/upd_0042.sql | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/install/sql/incremental/upd_0026.sql b/install/sql/incremental/upd_0026.sql index b5787a9..a859ee2 100644 --- a/install/sql/incremental/upd_0026.sql +++ b/install/sql/incremental/upd_0026.sql @@ -1 +1 @@ -ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ''; \ No newline at end of file +ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; \ No newline at end of file diff --git a/install/sql/incremental/upd_0042.sql b/install/sql/incremental/upd_0042.sql index 8d1b7b4..1c195b5 100644 --- a/install/sql/incremental/upd_0042.sql +++ b/install/sql/incremental/upd_0042.sql @@ -1,4 +1,4 @@ -- increase column size -ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL DEFAULT ''; +ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL; diff --git a/install/sql/incremental/upd_0067.sql b/install/sql/incremental/upd_0067.sql index 10eb88f..3604460 100644 --- a/install/sql/incremental/upd_0067.sql +++ b/install/sql/incremental/upd_0067.sql @@ -1,7 +1,7 @@ ALTER TABLE `client` - ADD `web_servers` blob NOT NULL DEFAULT '' AFTER `default_webserver`, - ADD `mail_servers` blob NOT NULL DEFAULT '' AFTER `default_mailserver`, - ADD `db_servers` blob NOT NULL DEFAULT '' AFTER `default_dbserver`, - ADD `dns_servers` blob NOT NULL DEFAULT '' AFTER `default_dnsserver`; + ADD `web_servers` blob NOT NULL AFTER `default_webserver`, + ADD `mail_servers` blob NOT NULL AFTER `default_mailserver`, + ADD `db_servers` blob NOT NULL AFTER `default_dbserver`, + ADD `dns_servers` blob NOT NULL AFTER `default_dnsserver`; UPDATE `client` SET `web_servers` = `default_webserver`, `mail_servers` = `default_mailserver`, `db_servers` = `default_dbserver`, `dns_servers` = `default_dnsserver` WHERE 1; -- Gitblit v1.9.1