[svn:dbi] r15513 - dbi/branches/sqlengine

Author: REHSACK
Date: Thu Dec 13 06:31:59 2012
New Revision: 15513

Modified:
   dbi/branches/sqlengine/   (props changed)
   dbi/branches/sqlengine/Changes
   dbi/branches/sqlengine/DBI.pm
   dbi/branches/sqlengine/DBI.xs

Log:
Merged /dbi/trunk:r15481-15512


Modified: dbi/branches/sqlengine/Changes
==============================================================================
--- dbi/branches/sqlengine/Changes	(original)
+++ dbi/branches/sqlengine/Changes	Thu Dec 13 06:31:59 2012
@@ -15,6 +15,7 @@
   Fixed RT#80474 - segfault in DESTROY with threads.
   Fixed RT#81516 - Test failures due to hash randomisation in perl 5.17.6
     thanks to Jens Rehsack and H.Merijn Brand and feedback on IRC
+  Fixed RT#81724 - Handle copy-on-write scalars (sprout)
   Fixed unused variable / self-assignment compiler warnings.
   Corrected typo in DBI->installed_versions docs RT#78825
     thanks to Jan Dubois.

Modified: dbi/branches/sqlengine/DBI.pm
==============================================================================
--- dbi/branches/sqlengine/DBI.pm	(original)
+++ dbi/branches/sqlengine/DBI.pm	Thu Dec 13 06:31:59 2012
@@ -7624,7 +7624,7 @@
 letter and driver specific names begin with a lowercase letter, as
 usual.
 
-Currently the DBI only defines two trace flags:
+Currently the DBI defines these trace flags:
 
   ALL - turn on all DBI and driver flags (not recommended)
   SQL - trace SQL statements executed

Modified: dbi/branches/sqlengine/DBI.xs
==============================================================================
--- dbi/branches/sqlengine/DBI.xs	(original)
+++ dbi/branches/sqlengine/DBI.xs	Thu Dec 13 06:31:59 2012
@@ -1975,6 +1975,7 @@
         && SvPVX(sv)   /* we have a buffer to discard */
         ) {
             SvOOK_off(sv);
+            sv_force_normal(sv);
             if (SvLEN(sv))
                 Safefree(SvPVX(sv));
             SvPOK_off(sv);