Author: timbo
Date: Thu Jun 21 14:40:01 2007
New Revision: 9668

Modified:
   dbi/trunk/Changes
   dbi/trunk/DBI.xs
   dbi/trunk/dbixs_rev.h
   dbi/trunk/lib/DBI/Gofer/Execute.pm

Log:
Fixed code that triggered fatal error in bleadperl thanks to Steve Hay.
Fixed compiler warning thanks to Jerry D. Hedden.


Modified: dbi/trunk/Changes
==============================================================================
--- dbi/trunk/Changes   (original)
+++ dbi/trunk/Changes   Thu Jun 21 14:40:01 2007
@@ -37,6 +37,12 @@
 Add trace modules that just records the last N trace messages into an array
 and prepends them to any error message.
 
+=head2 Changes in DBI 1.58 (svn rev XXXX),  XXth June 2007
+
+  Fixed code that triggered fatal error in bleadperl
+    thanks to Steve Hay.
+  Fixed compiler warning thanks to Jerry D. Hedden.
+
 =head2 Changes in DBI 1.57 (svn rev 9639),  13th June 2007
 
   Note: this release includes a change to the DBI::hash() function which will
@@ -86,7 +92,7 @@
     Added --dumpnodes and --delete options.
   Added/updated docs for both DBI::ProfileDumper && ::Apache.
 
-=head2 Changes in DBI 1.56 (svn rev 9561),  13th May 2007
+=head2 Changes in DBI 1.56 (svn rev 9660),  18th June 2007
 
   Fixed printf arg warnings thanks to JDHEDDEN.
   Fixed returning driver-private sth attributes via gofer.   

Modified: dbi/trunk/DBI.xs
==============================================================================
--- dbi/trunk/DBI.xs    (original)
+++ dbi/trunk/DBI.xs    Thu Jun 21 14:40:01 2007
@@ -4175,9 +4175,9 @@
        t1, t2
     );
     if (DBIc_TRACE_LEVEL(imp_xxh) >= 9)
-        warn("dbi_profile(%s, %s, %f, %f) =%s, gimme=%d",
+        warn("dbi_profile(%s, %s, %f, %f) =%s, gimme=%ld",
                 neatsvpv(statement,0), neatsvpv(method,0), t1, t2,
-                neatsvpv(leaf,0), GIMME_V);
+                neatsvpv(leaf,0), (long)GIMME_V);
     (void)cv;   /* avoid unused var warnings */
     if (GIMME_V == G_VOID)
         ST(0) = &sv_undef;  /* skip sv_mortalcopy if not needed */

Modified: dbi/trunk/dbixs_rev.h
==============================================================================
--- dbi/trunk/dbixs_rev.h       (original)
+++ dbi/trunk/dbixs_rev.h       Thu Jun 21 14:40:01 2007
@@ -1,3 +1 @@
-/* Mixed revision working copy */
-/* Code modified since last checkin */
-#define DBIXS_REVISION 9640
+#define DBIXS_REVISION 9659

Modified: dbi/trunk/lib/DBI/Gofer/Execute.pm
==============================================================================
--- dbi/trunk/lib/DBI/Gofer/Execute.pm  (original)
+++ dbi/trunk/lib/DBI/Gofer/Execute.pm  Thu Jun 21 14:40:01 2007
@@ -596,8 +596,9 @@
 
 sub _mk_rand_callback {
     my ($self, $method, $fail_percent, $delay_percent, $delay_duration) = @_;
-    $fail_percent  ||= 0;  my $fail_modrate  = int(1/(-$fail_percent )*100) if 
$fail_percent;
-    $delay_percent ||= 0;  my $delay_modrate = int(1/(-$delay_percent)*100) if 
$delay_percent;
+    my ($fail_modrate, $delay_modrate);
+    $fail_percent  ||= 0;  $fail_modrate  = int(1/(-$fail_percent )*100) if 
$fail_percent;
+    $delay_percent ||= 0;  $delay_modrate = int(1/(-$delay_percent)*100) if 
$delay_percent;
     # note that $method may be "*"
     return sub {
         my ($h) = @_;

Reply via email to