From: Peter Rabbitson <ribasushi@cpan.org>
Date: Fri, 4 Dec 2009 08:34:56 +0000 (+0000)
Subject: Variable clash
X-Git-Tag: v0.08116~103^2~17
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=17555a0c43f9bfb63cb953ac797edca4b93390b7;p=dbsrgits%2FDBIx-Class.git

Variable clash
---

diff --git a/lib/DBIx/Class/Storage/DBI/MSSQL.pm b/lib/DBIx/Class/Storage/DBI/MSSQL.pm
index 4add28c..cfbc634 100644
--- a/lib/DBIx/Class/Storage/DBI/MSSQL.pm
+++ b/lib/DBIx/Class/Storage/DBI/MSSQL.pm
@@ -193,12 +193,12 @@ sub _select_args_to_query {
     return $self->next::method (@_);
   }
 
-  my ($sql, $bind, @rest) = $self->next::method (@_);
+  my ($sql, $prep_bind, @rest) = $self->next::method (@_);
   $sql =~ s/^ \s* SELECT \s/SELECT TOP 100 PERCENT /xi;
 
   return wantarray
-    ? ($sql, $bind, @rest)
-    : \[ "($sql)", @$bind ]
+    ? ($sql, $prep_bind, @rest)
+    : \[ "($sql)", @$prep_bind ]
   ;
 }