From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Mon, 13 Apr 2015 02:38:28 +0000 (+1200)
Subject: CRM-16280 remove NOT NULL from upgrade sql to reflect schema & resolve upgrade failure
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=513ced9daf40db724784c0281a01345b215aa460;p=civicrm-core.git

CRM-16280 remove NOT NULL from upgrade sql to reflect schema & resolve upgrade failure
---

diff --git a/CRM/Upgrade/Incremental/sql/4.6.beta2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.beta2.mysql.tpl
index 6f02f6dbac..fa8109ae9c 100644
--- a/CRM/Upgrade/Incremental/sql/4.6.beta2.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.6.beta2.mysql.tpl
@@ -1,6 +1,6 @@
 {* file to handle db changes in 4.6.beta2 during upgrade *}
 -- CRM-16018
-ALTER TABLE  `civicrm_membership_block` CHANGE  `membership_types`  `membership_types` VARCHAR( 1024 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT  'Membership types to be exposed by this block.';
+ALTER TABLE  `civicrm_membership_block` CHANGE  `membership_types`  `membership_types` VARCHAR( 1024 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci COMMENT  'Membership types to be exposed by this block.';
 
 -- CRM-15578 Require access CiviMail permission for A/B Testing feature
 UPDATE civicrm_navigation