Author: timbo
Date: Fri Oct 15 04:24:19 2010
New Revision: 14485
Modified:
dbi/trunk/Changes
dbi/trunk/DBI.xs
Log:
Fixed spurious dbi_profile lines written to the log in some situations
Modified: dbi/trunk/Changes
==============================================================================
--- dbi/trunk/Changes (original)
+++ dbi/trunk/Changes Fri Oct 15 04:24:19 2010
@@ -8,6 +8,8 @@
=head2 Changes in DBI 1.616 (svn rNNN) XXX
+ Fixed spurious dbi_profile lines written to the log when
+ profiling is enabled and a trace flag, like SQL, is used.
Optimized connect() to remove redundant FETCH of \%attrib values.
Adding fix to recognize SQL::Statement errors even if instantiated
with RaiseError=0 (Jens Rehsack)
Modified: dbi/trunk/DBI.xs
==============================================================================
--- dbi/trunk/DBI.xs (original)
+++ dbi/trunk/DBI.xs Fri Oct 15 04:24:19 2010
@@ -2673,7 +2673,7 @@
}
statement_pv = SvPV_nolen(statement_sv);
- if (DBIc_DBISTATE(imp_xxh)->debug >= 4)
+ if (DBIc_TRACE_LEVEL(imp_xxh) >= 4)
PerlIO_printf(DBIc_LOGPIO(imp_xxh), " dbi_profile +%" NVff "s %s
%s\n",
ti, method_pv, neatsvpv(statement_sv,0));
@@ -5053,7 +5053,7 @@
/* we don't test IMPSET here because this code applies to pure-perl
drivers */
if (DBIc_IADESTROY(imp_sth)) { /* want's ineffective destroy */
DBIc_ACTIVE_off(imp_sth);
- if (DBIc_DBISTATE(imp_sth)->debug)
+ if (DBIc_TRACE_LEVEL(imp_sth))
PerlIO_printf(DBIc_LOGPIO(imp_sth), " DESTROY %s
skipped due to InactiveDestroy\n", SvPV_nolen(sth));
}
if (DBIc_ACTIVE(imp_sth)) {
