[SCM] Debian packaging of DBD-Firebird CPAN distribution branch, master, updated. upstream/0.60-22-g1458c93

[Damyan Ivanov]

The following commit has been merged in the master branch:
commit 1458c93b928f5b60cf4a6ab159b049dbb2ab5b6d
Author: Damyan Ivanov <dmn at debian.org>
Date:   Mon Sep 19 11:30:52 2011 +0300

    fix return value of recode_string

diff --git a/debian/patches/ib_encoding.patch b/debian/patches/ib_encoding.patch
index 5a081e7..5d1fdc5 100644
--- a/debian/patches/ib_encoding.patch
+++ b/debian/patches/ib_encoding.patch
@@ -58,13 +58,13 @@ Forwarded: no
 +        ret = v;
 +    }
 +
-+    return v;
++    return ret;
 +}
 +
  /* higher level error handling, check and decode status */
  int ib_error_check(SV *h, ISC_STATUS *status)
  {
-@@ -1368,6 +1416,8 @@ AV *dbd_st_fetch(SV *sth, imp_sth_t *imp
+@@ -1344,6 +1392,8 @@ AV *dbd_st_fetch(SV *sth, imp_sth_t *imp
                      }
                      else
                          sv_setpvn(sv, var->sqldata, var->sqllen);
@@ -73,7 +73,7 @@ Forwarded: no
                      break;
  
                  case SQL_VARYING:
-@@ -1375,6 +1425,7 @@ AV *dbd_st_fetch(SV *sth, imp_sth_t *imp
+@@ -1351,6 +1401,7 @@ AV *dbd_st_fetch(SV *sth, imp_sth_t *imp
                      DBD_VARY *vary = (DBD_VARY *) var->sqldata;
                      sv_setpvn(sv, vary->vary_string, vary->vary_length);
                      /* Note that sqllen for VARCHARs is the max length */
@@ -81,7 +81,7 @@ Forwarded: no
                      break;
                  }
  
-@@ -1530,11 +1581,13 @@ AV *dbd_st_fetch(SV *sth, imp_sth_t *imp
+@@ -1490,11 +1541,13 @@ AV *dbd_st_fetch(SV *sth, imp_sth_t *imp
                           blob_segment_buffer[BLOB_SEGMENT];
                      char blob_info_items[] =
                      {
@@ -95,7 +95,7 @@ Forwarded: no
  
                      /* Open the Blob according to the Blob id. */
                      isc_open_blob2(status, &(imp_dbh->db), &(imp_dbh->tr),
-@@ -1577,6 +1630,9 @@ AV *dbd_st_fetch(SV *sth, imp_sth_t *imp
+@@ -1537,6 +1590,9 @@ AV *dbd_st_fetch(SV *sth, imp_sth_t *imp
                            case isc_info_blob_total_length:
                                total_length = isc_vax_integer(p, length);
                                break;
@@ -105,7 +105,7 @@ Forwarded: no
                          }
                          p += length;
                      }
-@@ -1672,6 +1728,8 @@ AV *dbd_st_fetch(SV *sth, imp_sth_t *imp
+@@ -1632,6 +1688,8 @@ AV *dbd_st_fetch(SV *sth, imp_sth_t *imp
                      if (ib_error_check(sth, status))
                          return FALSE;
  
@@ -114,7 +114,7 @@ Forwarded: no
                      break;
                  }
  
-@@ -2019,12 +2077,15 @@ int ib_blob_write(SV *sth, imp_sth_t *im
+@@ -1977,12 +2035,15 @@ int ib_blob_write(SV *sth, imp_sth_t *im
          return FALSE;
  
  
@@ -132,7 +132,7 @@ Forwarded: no
      /* write it segment by segment */
      seg_len = BLOB_SEGMENT;
      while (total_length > 0)
-@@ -2172,6 +2233,8 @@ static int ib_fill_isqlda(SV *sth, imp_s
+@@ -2126,6 +2187,8 @@ static int ib_fill_isqlda(SV *sth, imp_s
              char *string;
              STRLEN len;
  
@@ -141,7 +141,7 @@ Forwarded: no
              string = SvPV(value, len);
  
              if (len > ivar->sqllen) {
-@@ -2195,6 +2258,8 @@ static int ib_fill_isqlda(SV *sth, imp_s
+@@ -2149,6 +2212,8 @@ static int ib_fill_isqlda(SV *sth, imp_s
              char *string;
              STRLEN len;
  
@@ -152,7 +152,7 @@ Forwarded: no
              if (len > ivar->sqllen) {
 --- a/Firebird.pm
 +++ b/Firebird.pm
-@@ -117,9 +117,13 @@ sub connect
+@@ -118,9 +118,13 @@ sub connect
  
      DBD::Firebird->_OdbcParse($dsn, $private_attr_hash,
                                 ['database', 'host', 'port', 'ib_role', 'ib_dbkey_scope',
@@ -167,7 +167,7 @@ Forwarded: no
      # second attr args will be retrieved using DBIc_IMP_DATA
      my $dbh = DBI::_new_dbh($drh, {}, $private_attr_hash);
  
-@@ -307,6 +311,7 @@ uses all possible parameters:
+@@ -308,6 +312,7 @@ uses all possible parameters:
   ib_dialect=$dialect;
   ib_role=$role;
   ib_charset=$charset;
@@ -175,7 +175,7 @@ Forwarded: no
   ib_cache=$cache
   DSN
  
-@@ -328,6 +333,10 @@ respective meanings:
+@@ -329,6 +334,10 @@ respective meanings:
      ib_dialect      the SQL dialect to be used              optional
      ib_role         the role of the user                    optional
      ib_charset      character set to be used                optional

-- 
Debian packaging of DBD-Firebird CPAN distribution