/ Check-in [404bd98f]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix a compiler warning introduced by the previous check-in.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 404bd98fb41f71d041932d68a908570995825ec1
User & Date: drh 2013-11-07 21:32:16
Context
2013-11-07
23:23
Add many new options to the wordcount test program: --delete, --pagesize, --cachesize, --commit, --nosync, and --journal. check-in: e938112d user: drh tags: trunk
22:11
Fix temporary directory separator handling for Cygwin. Closed-Leaf check-in: 9d870d5f user: mistachkin tags: cygDirSep
21:32
Fix a compiler warning introduced by the previous check-in. check-in: 404bd98f user: drh tags: trunk
21:25
Enable the WHERE_ONEPASS_DESIRED optimization for UPDATE operations on WITHOUT ROWID tables. check-in: 21530798 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/update.c.

   124    124   #ifndef SQLITE_OMIT_TRIGGER
   125    125     int isView;            /* True when updating a view (INSTEAD OF trigger) */
   126    126     Trigger *pTrigger;     /* List of triggers on pTab, if required */
   127    127     int tmask;             /* Mask of TRIGGER_BEFORE|TRIGGER_AFTER */
   128    128   #endif
   129    129     int newmask;           /* Mask of NEW.* columns accessed by BEFORE triggers */
   130    130     int iEph = 0;          /* Ephemeral table holding all primary key values */
   131         -  int nKey;              /* Number of elements in regKey */
          131  +  int nKey = 0;          /* Number of elements in regKey for WITHOUT ROWID */
   132    132   
   133    133     /* Register Allocations */
   134    134     int regRowCount = 0;   /* A count of rows changed */
   135    135     int regOldRowid;       /* The old rowid */
   136    136     int regNewRowid;       /* The new rowid */
   137    137     int regNew;            /* Content of the NEW.* table in triggers */
   138    138     int regOld = 0;        /* Content of OLD.* table in triggers */
................................................................................
   377    377         sqlite3VdbeChangeToNoop(v, addrOpen);
   378    378         nKey = nPk;
   379    379         regKey = iPk;
   380    380       }else{
   381    381         sqlite3VdbeAddOp4(v, OP_MakeRecord, iPk, nPk, regKey,
   382    382                           sqlite3IndexAffinityStr(v, pPk), P4_TRANSIENT);
   383    383         sqlite3VdbeAddOp2(v, OP_IdxInsert, iEph, regKey);
   384         -      nKey = 0;
   385    384       }
   386    385       sqlite3WhereEnd(pWInfo);
   387    386     }
   388    387   
   389    388     /* Initialize the count of updated rows
   390    389     */
   391    390     if( (db->flags & SQLITE_CountRows) && !pParse->pTriggerTab ){