diff options
| author | mjl <mjl@pkgsrc.org> | 2002-08-21 23:10:38 +0000 |
|---|---|---|
| committer | mjl <mjl@pkgsrc.org> | 2002-08-21 23:10:38 +0000 |
| commit | 34ad22728ce2dea0f10d7d025b3cb7b46e3a4f80 (patch) | |
| tree | e7053abd1b081c2e0706bc98c102e78969e6e062 /databases | |
| parent | 2ecc4db63e827b97aa51d740b9501e085a4682c6 (diff) | |
| download | pkgsrc-34ad22728ce2dea0f10d7d025b3cb7b46e3a4f80.tar.gz | |
Fix problems introduced by our local patch: AutoCommit handles wouldn't,
and executes on closed handles crashed perl hard. Fixes PR/18009.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/p5-DBD-postgresql/Makefile | 4 | ||||
| -rw-r--r-- | databases/p5-DBD-postgresql/distinfo | 4 | ||||
| -rw-r--r-- | databases/p5-DBD-postgresql/patches/patch-aa | 29 |
3 files changed, 19 insertions, 18 deletions
diff --git a/databases/p5-DBD-postgresql/Makefile b/databases/p5-DBD-postgresql/Makefile index 5c6f10cda06..45ea0b650cb 100644 --- a/databases/p5-DBD-postgresql/Makefile +++ b/databases/p5-DBD-postgresql/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.17 2002/06/18 12:43:02 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2002/08/21 23:10:38 mjl Exp $ # VER= 1.13 DISTNAME= DBD-Pg-${VER} PKGNAME= p5-DBD-postgresql-${VER} -PKGREVISION= 1 +PKGREVISION= 2 SVR4_PKGNAME= p5dpo CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/JBAKER/} diff --git a/databases/p5-DBD-postgresql/distinfo b/databases/p5-DBD-postgresql/distinfo index 42a7574678f..51352d80a08 100644 --- a/databases/p5-DBD-postgresql/distinfo +++ b/databases/p5-DBD-postgresql/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.11 2002/06/18 07:06:44 explorer Exp $ +$NetBSD: distinfo,v 1.12 2002/08/21 23:10:38 mjl Exp $ SHA1 (DBD-Pg-1.13.tar.gz) = f99a5aeebd71e0cac273311cb3405d9ed5e3e9c2 Size (DBD-Pg-1.13.tar.gz) = 43038 bytes -SHA1 (patch-aa) = 1285ae6d29d41e1d7447909aed385145e16f8681 +SHA1 (patch-aa) = bd394a9052e532c6deb59c0531ed34b0f4f98e3e SHA1 (patch-ab) = 5b8ee2423026727afdf87a482f681003d491ec39 diff --git a/databases/p5-DBD-postgresql/patches/patch-aa b/databases/p5-DBD-postgresql/patches/patch-aa index 864b91eca2b..2c8907c797b 100644 --- a/databases/p5-DBD-postgresql/patches/patch-aa +++ b/databases/p5-DBD-postgresql/patches/patch-aa @@ -1,8 +1,7 @@ -$NetBSD: patch-aa,v 1.1 2002/06/18 07:05:32 explorer Exp $ +$NetBSD: patch-aa,v 1.2 2002/08/21 23:10:39 mjl Exp $ -diff -ur dbdimp.c.orig dbdimp.c ---- dbdimp.c.orig Thu Apr 4 18:55:51 2002 -+++ dbdimp.c Wed May 15 19:16:54 2002 +--- dbdimp.c.orig Sat Apr 27 22:35:52 2002 ++++ dbdimp.c Thu Aug 22 01:01:06 2002 @@ -40,6 +40,30 @@ @@ -12,7 +11,7 @@ diff -ur dbdimp.c.orig dbdimp.c + PGresult *result = NULL; + ExecStatusType status; + -+ if (DBIc_has(imp_dbh, DBIcf_AutoCommit) == TRUE) ++ if (DBIc_has(imp_dbh, DBIcf_AutoCommit) != FALSE) + return 1; + + if (imp_dbh->need_begin == 0) @@ -126,13 +125,15 @@ diff -ur dbdimp.c.orig dbdimp.c } if (dbis->debug >= 2) { PerlIO_printf(DBILOGFP, "dbd_db_STORE: switch AutoCommit to off: begin\n"); } } -@@ -1027,6 +1036,9 @@ - SV **svp; - - if (dbis->debug >= 1) { PerlIO_printf(DBILOGFP, "dbd_st_execute\n"); } +@@ -1080,6 +1089,11 @@ + return -2; + } + ++ if (_dbd_begin(imp_dbh) == 0) { ++ pg_error(sth, -1, "executing begin failed\n"); ++ return -2; ++ } + -+ if (_dbd_begin(imp_dbh) == 0) -+ return 0; - - /* - here we get the statement from the statement handle where + statement = imp_sth->statement; + if (! statement) { + /* are we prepared ? */ |