[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm-5_1: rpm/ CHANGES rpm/rpmdb/ sqlite.c
From:       "Jeff Johnson" <jbj () rpm5 ! org>
Date:       2010-07-22 17:54:37
Message-ID: 20100722175438.07D9ABA48C () rpm5 ! org
[Download RAW message or body]

  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   22-Jul-2010 19:54:37
  Branch: rpm-5_1                          Handle: 2010072217543502

  Modified files:           (Branch: rpm-5_1)
    rpm                     CHANGES
    rpm/rpmdb               sqlite.c

  Log:
    - sqlite: fix: avoid assert failure w %trigger* SECONDARY-SEQUENTIAL
    	retrieval using only secondary keys for performance.

  Summary:
    Revision    Changes     Path
    1.2288.2.309+2  -0      rpm/CHANGES
    1.33.2.5    +1  -1      rpm/rpmdb/sqlite.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.308 -r1.2288.2.309 CHANGES
  --- rpm/CHANGES	28 Apr 2010 17:25:01 -0000	1.2288.2.308
  +++ rpm/CHANGES	22 Jul 2010 17:54:35 -0000	1.2288.2.309
  @@ -1,4 +1,6 @@
   5.1.9 -> 5.1.10:
  +    - jbj: sqlite: fix: avoid assert failure w %trigger* SECONDARY-SEQENTIAL
  +	retrieval using ony secondary keys for performance.
       - jbj: tests: "make check" for RHEL6 beta passes.
       - jbj: backport "make check" sufficient to verify signatures.
       - jbj: tests: re-enable additional build options.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/sqlite.c
  ============================================================================
  $ cvs diff -u -r1.33.2.4 -r1.33.2.5 sqlite.c
  --- rpm/rpmdb/sqlite.c	27 Mar 2009 17:42:31 -0000	1.33.2.4
  +++ rpm/rpmdb/sqlite.c	22 Jul 2010 17:54:37 -0000	1.33.2.5
  @@ -1266,7 +1266,7 @@
   /* 1 key should return 0 or 1 row/value */
   assert(scp->nr < 2);
   
  -    if (scp->nr == 0 && scp->all == 0)
  +    if (scp->nr == 0 && !(dbi->dbi_rpmtag == RPMDBI_PACKAGES && scp->all == 1))
           rc = DB_NOTFOUND; /* No data for that key found! */
   
       if (rc != 0)
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]