--- PApp-SQL/SQL.xs	2001/12/31 03:05:03	1.9
+++ PApp-SQL/SQL.xs	2002/02/27 04:32:39	1.11
@@ -8,7 +8,7 @@
 # define call_sv     perl_call_sv
 #endif
 
-#if (PERL_VERSION < 5) || ((PERL_VERSION == 5) && (PERL_SUBVERSION <= 5))
+#if (PERL_VERSION > 5) || ((PERL_VERSION == 5) && (PERL_SUBVERSION >= 6))
 # define CAN_UTF8 1
 #endif
 
@@ -313,14 +313,14 @@
             if (count != 1)
               croak ("sql_exec: execute() didn't return any value ('%s'): %s",
                      SvPV (sql, dc),
-                     SvPV (get_sv ("DBI::errstr", TRUE), dc));
+                     SvPV (get_sv ("DBI::errstr", TRUE), dd));
 
             execute = POPs;
 
             if (!SvTRUE (execute))
               croak ("sql_exec: unable to execute statement '%s' (%s)",
                      SvPV (sql, dc),
-                     SvPV (get_sv ("DBI::errstr", TRUE), dc));
+                     SvPV (get_sv ("DBI::errstr", TRUE), dd));
 
             sv_setsv (GvSV(sql_exec), execute);
 
@@ -341,12 +341,12 @@
                 if (count != 1)
                   croak ("sql_exec: bind_columns() didn't return any value ('%s'): %s",
                          SvPV (sql, dc),
-                         SvPV (get_sv ("DBI::errstr", TRUE), dc));
+                         SvPV (get_sv ("DBI::errstr", TRUE), dd));
 
                 if (!SvOK (POPs))
                   croak ("sql_exec: bind_columns() didn't return a true ('%s'): %s",
                          SvPV (sql, dc),
-                         SvPV (get_sv ("DBI::errstr", TRUE), dc));
+                         SvPV (get_sv ("DBI::errstr", TRUE), dd));
               }
 
             /* free our arguments from the stack */