Revert incorrectly backported fix for RT#102166 ( e8f23a77 )

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Storage / BlockRunner.pm

diff --git a/lib/DBIx/Class/Storage/BlockRunner.pm b/lib/DBIx/Class/Storage/BlockRunner.pm
index 2862669..be29701 100644 (file)
--- a/lib/DBIx/Class/Storage/BlockRunner.pm
+++ b/lib/DBIx/Class/Storage/BlockRunner.pm
@@ -188,12 +188,7 @@ sub _run {
           # FIXME - we assume that $storage->{_dbh_autocommit} is there if
           # txn_init_depth is there, but this is a DBI-ism
           $txn_init_depth > ( $storage->{_dbh_autocommit} ? 0 : 1 )
-        )
-          or
-        ! do {
-          local $self->storage->{_in_do_block_retry_handler} = 1;
-          $self->retry_handler->($self)
-        }
+        ) or ! $self->retry_handler->($self)
       );
 
       # we got that far - let's retry