From: Alan Knowles <alan@akbkhome.com>
Date: Wed, 6 Apr 2011 06:10:11 +0000 (+0800)
Subject: Merge branch 'master' of http://git.roojs.com:8081/Pman.Core
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=647f1bbce1e0633473e193d966530bd5f110088f

Merge branch 'master' of git.roojs.com:8081/Pman.Core
---

647f1bbce1e0633473e193d966530bd5f110088f
diff --cc DataObjects/core.sql
index 4ea894f8,d2891956..47d8fe77
--- a/DataObjects/core.sql
+++ b/DataObjects/core.sql
@@@ -324,10 -324,8 +324,10 @@@ CREATE TABLE  core_notify  
    PRIMARY KEY (`id`),
    INDEX `lookup`(`act_when`, `msgid`)
  );
 +ALTER TABLE core_notify CHANGE COLUMN bounced event_id INT(11) DEFAULT 0;
 +
  
- 
+ ALTER TABLE core_notify CHANGE COLUMN bounced event_id INT(11) NOT NULL DEFAULT 0;
   
  
  # - used by email / tracker to handle alises - we have to be carefull adding to this table...