From: Peter Rabbitson <ribasushi@cpan.org>
Date: Sun, 12 Sep 2010 16:48:36 +0000 (+0200)
Subject: Remove bogus pre-txn_begin first-connect call
X-Git-Tag: v0.08124~79
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d8a5a2340b0ac0dbf1c3e7779e7951b1bec2ccd5;p=dbsrgits%2FDBIx-Class.git

Remove bogus pre-txn_begin first-connect call
Rename the txn-retry debug envvar
---

diff --git a/lib/DBIx/Class/Storage/DBI.pm b/lib/DBIx/Class/Storage/DBI.pm
index 10d3306..3848387 100644
--- a/lib/DBIx/Class/Storage/DBI.pm
+++ b/lib/DBIx/Class/Storage/DBI.pm
@@ -808,8 +808,6 @@ sub txn_do {
     my $args = \@_;
 
     try {
-      $self->_get_dbh;
-
       $self->txn_begin;
       if($want_array) {
           @result = $coderef->(@$args);
@@ -846,7 +844,7 @@ sub txn_do {
     # We were not connected, and was first try - reconnect and retry
     # via the while loop
     carp "Retrying $coderef after catching disconnected exception: $exception"
-      if $ENV{DBIC_DBIRETRY_DEBUG};
+      if $ENV{DBIC_TXNRETRY_DEBUG};
     $self->_populate_dbh;
   }
 }