Merge commit '9942d1dc86' into 4.5-missing-prs

[civicrm-core.git] / sql / civicrm_generated.mysql

diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index a1bb3e3d5f8ad84b5248c7fbe5345c7fdb10ca24..199b7aea3eea6c4db9eb3e2210d27603a7abca57 100644 (file)
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -391,7 +391,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_domain` WRITE;
 /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
-INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.5.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.5.8',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
 /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -919,7 +919,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_membership_status` WRITE;
 /*!40000 ALTER TABLE `civicrm_membership_status` DISABLE KEYS */;
-INSERT INTO `civicrm_membership_status` (`id`, `name`, `label`, `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 (1,'New','New','join_date',NULL,NULL,'join_date','month',3,1,0,1,0,1,0),(2,'Current','Current','start_date',NULL,NULL,'end_date',NULL,NULL,1,0,2,1,1,0),(3,'Grace','Grace','end_date',NULL,NULL,'end_date','month',1,1,0,3,0,1,0),(4,'Expired','Expired','end_date','month',1,NULL,NULL,NULL,0,0,4,0,1,0),(5,'Pending','Pending','join_date',NULL,NULL,'join_date',NULL,NULL,0,0,5,0,1,1),(6,'Cancelled','Cancelled','join_date',NULL,NULL,'join_date',NULL,NULL,0,0,6,0,1,0),(7,'Deceased','Deceased',NULL,NULL,NULL,NULL,NULL,NULL,0,1,7,0,1,1);
+INSERT INTO `civicrm_membership_status` (`id`, `name`, `label`, `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 (1,'New','New','join_date',NULL,NULL,'join_date','month',3,1,0,1,0,1,0),(2,'Current','Current','start_date',NULL,NULL,'end_date',NULL,NULL,1,0,2,1,1,0),(3,'Grace','Grace','end_date',NULL,NULL,'end_date','month',1,1,0,3,0,1,0),(4,'Expired','Expired','end_date','month',1,NULL,NULL,NULL,0,0,4,0,1,0),(5,'Pending','Pending','join_date',NULL,NULL,'join_date',NULL,NULL,0,0,5,0,1,1),(6,'Cancelled','Cancelled','join_date',NULL,NULL,'join_date',NULL,NULL,0,0,6,0,1,1),(7,'Deceased','Deceased',NULL,NULL,NULL,NULL,NULL,NULL,0,1,7,0,1,1);
 /*!40000 ALTER TABLE `civicrm_membership_status` ENABLE KEYS */;
 UNLOCK TABLES;