Merge branch 'innodb' into 8

Conflicts:
	lib/WebGUI/Asset/Wobject/DataForm.pm
This commit is contained in:
Doug Bell 2010-02-17 15:09:04 -06:00
commit 8701842829
4 changed files with 3745 additions and 13 deletions

File diff suppressed because it is too large Load diff

View file

@ -55,6 +55,7 @@ sub migrateToNewCache {
my $db = $session->db;
$db->write("drop table cache");
$db->write("delete from WorkflowActivity where className in ('WebGUI::Workflow::Activity::CleanDatabaseCache','WebGUI::Workflow::Activity::CleanFileCache')");
$db->write("delete from WorkflowActivityData where activityId in ('pbwfactivity0000000002','pbwfactivity0000000022')");
print "DONE!\n" unless $quiet;
}