Accounting trigger setup fails during upgrade

While running a drush upgrade (4.0=>trunk), I encountered an SQL syntax error with "CREATE TRIGGER `civicrm_financial_type_ad` ...". There are two problems with this code:

1) The sourceSQLFile() helper does not support DELIMITER.

2) The normal way for us to add triggers is using the 'trigger rebuild' structure. This is necessary because MySQL only allows one trigger per (table,event,when)-tuple, and we have independent pieces of code (like locking, logging, and third-party modules) that need to attach triggers to the same table. For references, see CRM_Core_DAO::triggerRebuild() which calls CRM_Contact_BAO_Contact::triggerInfo() .