From: Mark Wells <mark@freeside.biz>
Date: Fri, 13 Jun 2014 19:48:02 +0000 (-0700)
Subject: but don't break Pg cursors in the process, #28895
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=4ee96719dd1665ef3694aa983cc9046b53e8cc5d

but don't break Pg cursors in the process, #28895
---

diff --git a/FS/FS/Cursor.pm b/FS/FS/Cursor.pm
index 3af3c1bff..f6d8816a7 100644
--- a/FS/FS/Cursor.pm
+++ b/FS/FS/Cursor.pm
@@ -77,13 +77,13 @@ sub new {
   }
 
   $sth->execute or die $sth->errstr;
-  # in mysql, make sure we're not holding any locks on the tables mentioned
-  # in the query; in Pg this will do nothing.
-  $dbh->commit;
 
   if ( driver_name() eq 'Pg' ) {
     $self->{fetch} = $dbh->prepare("FETCH FORWARD $buffer FROM ".$self->{id});
   } elsif ( driver_name() eq 'mysql' ) {
+    # make sure we're not holding any locks on the tables mentioned
+    # in the query
+    $dbh->commit if driver_name() eq 'mysql';
     $self->{fetch} = $dbh->prepare("SELECT * FROM $self->{id} ORDER BY rownum LIMIT ?, $buffer");
   }