Merge 'trunk' into 'prefetch_bug-unqualified_column_in_search_related_cond'
Peter Rabbitson [Thu, 12 Nov 2009 11:07:38 +0000 (11:07 +0000)]
r7881@Thesaurus (orig r7869):  ribasushi | 2009-11-12 11:10:04 +0100
_cond_for_update_delete is hopelessly broken attempting to introspect SQLA1. Replace with a horrific but effective hack
r7882@Thesaurus (orig r7870):  ribasushi | 2009-11-12 11:15:12 +0100
Clarifying comment

1  2 
lib/DBIx/Class/ResultSet.pm
lib/DBIx/Class/Storage/DBI.pm

Simple merge
Simple merge