From: Matt S Trout <mst@shadowcat.co.uk>
Date: Fri, 11 May 2007 03:18:37 +0000 (+0000)
Subject: Merge 'DBIx-Class-current' into 'bulk_create'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b5e9214cde0ae129ebc5121a4fc9ccc7492f2d2e;p=dbsrgits%2FDBIx-Class-Historic.git

Merge 'DBIx-Class-current' into 'bulk_create'

r50790@cain (orig r3288):  blblack | 2007-05-10 23:46:23 +0000
Got rid of effectively dead dbh_do code in the txn_{begin|end|rollback} funcs
Reworked the AutoCommit/transaction_depth stuff so that transaction_depth is always 1 or higher with AutoCommit off
Doc updates to recommend AutoCommit => 1 / txn_do
Warn if the user doesn't explicitly set AutoCommit
Added AutoCommit => 1 to some tests that were triggering the above warning

r50793@cain (orig r3291):  claco | 2007-05-11 01:59:38 +0000
Updated prereq version of CAG to 0.05001
r50795@cain (orig r3293):  matthewt | 2007-05-11 02:52:12 +0000
 r35887@cain (orig r3046):  matthewt | 2007-01-20 23:37:02 +0000
 half-finished collapse code

r50796@cain (orig r3294):  matthewt | 2007-05-11 02:53:24 +0000
 r50794@cain (orig r3292):  matthewt | 2007-05-11 02:51:46 +0000
 collapse result refac hopefully complete

r50797@cain (orig r3295):  matthewt | 2007-05-11 02:56:11 +0000
post-merge fixups
r50798@cain (orig r3296):  matthewt | 2007-05-11 03:03:40 +0000
autocommit error gone for dbicadmin test
---

b5e9214cde0ae129ebc5121a4fc9ccc7492f2d2e