--CRM-15558, Fixed size of the civicrm_mailing_bounce_type.name field

diff --git a/CRM/Upgrade/Incremental/sql/4.5.3.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.3.mysql.tpl
index cee9125d6be213d7ca0effa42ad1ef99e8c04127..05eb16fb5fd65b2233f3d1428a3b421a9fe7e9ff 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.5.3.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.5.3.mysql.tpl
@@ -6,4 +6,7 @@ SELECT @membershipStatusWeight := max(weight) + 1 FROM civicrm_membership_status
 
 INSERT INTO civicrm_membership_status (id, name, {localize field='label'}label{/localize}, start_event, start_event_adjust_unit, start_event_adjust_interval, end_event, end_event_adjust_unit, end_event_adjust_interval, is_current_member, is_admin, weight, is_default, is_active, is_reserved)
 VALUES (@membershipStatusId, 'Cancelled', {localize}'{ts escape="sql"}Cancelled{/ts}'{/localize}, 'join_date', null, null, 'join_date', null, null, 0, 0, @membershipStatusWeight, 0, 0, 1) 
-ON DUPLICATE KEY UPDATE is_reserved = 1;
\ No newline at end of file
+ON DUPLICATE KEY UPDATE is_reserved = 1;
+
+-- CRM-15558
+ALTER TABLE `civicrm_mailing_bounce_type` CHANGE `name` `name` VARCHAR( 24 ) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL COMMENT 'Type of bounce';
\ No newline at end of file

diff --git a/xml/schema/Mailing/BounceType.xml b/xml/schema/Mailing/BounceType.xml
index 3279d2d30fd0790de9ebe5d6e682cf5d454d65c7..4eacbd2df8956e43e69d4e3962ebedbf2b273b0a 100644 (file)
--- a/xml/schema/Mailing/BounceType.xml
+++ b/xml/schema/Mailing/BounceType.xml
@@ -17,7 +17,7 @@
   <field>
     <name>name</name>
     <type>varchar</type>
-    <length>8</length>
+    <length>24</length>
     <required>true</required>
     <comment>Type of bounce</comment>
   </field>