/ Check-in [f578e62ae6]
Login

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

Overview
Comment:Fix a harmless compiler warning that arose from the ENABLE_CURSOR_HINTS fix of check-in [0af18674ca5b34e67e]
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: f578e62ae6f6cc78d8281adab9fa93f3f58711879c2860bbe19f291d257dc0af
User & Date: drh 2018-09-12 00:21:11
Context
2018-09-12
00:48
For MSVC, migrate some commonly used shell compilation options to the library. check-in: 68a71e5f4e user: mistachkin tags: trunk
00:21
Fix a harmless compiler warning that arose from the ENABLE_CURSOR_HINTS fix of check-in [0af18674ca5b34e67e] check-in: f578e62ae6 user: drh tags: trunk
2018-09-11
19:05
Do not do the byte-by-byte modifications in the resetdb.test script if the reserved-byte flag in the DB header is non-zero, because in that case the bytes will be in the wrong place and the test won't work. check-in: 0af18674ca user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vdbeaux.c.

  3004   3004   
  3005   3005     /* If the VM did not run to completion or if it encountered an
  3006   3006     ** error, then it might not have been halted properly.  So halt
  3007   3007     ** it now.
  3008   3008     */
  3009   3009     sqlite3VdbeHalt(p);
  3010   3010   
  3011         -  /* If the VDBE has be run even partially, then transfer the error code
         3011  +  /* If the VDBE has been run even partially, then transfer the error code
  3012   3012     ** and error message from the VDBE into the main database structure.  But
  3013   3013     ** if the VDBE has just been set to run but has not actually executed any
  3014   3014     ** instructions yet, leave the main database error information unchanged.
  3015   3015     */
  3016   3016     if( p->pc>=0 ){
  3017   3017       vdbeInvokeSqllog(p);
  3018   3018       sqlite3VdbeTransferError(p);

Changes to src/wal.c.

  2729   2729   ** it takes a snapshot of the state of the WAL and wal-index for the current
  2730   2730   ** instant in time.  The current thread will continue to use this snapshot.
  2731   2731   ** Other threads might append new content to the WAL and wal-index but
  2732   2732   ** that extra content is ignored by the current thread.
  2733   2733   **
  2734   2734   ** If the database contents have changes since the previous read
  2735   2735   ** transaction, then *pChanged is set to 1 before returning.  The
  2736         -** Pager layer will use this to know that is cache is stale and
         2736  +** Pager layer will use this to know that its cache is stale and
  2737   2737   ** needs to be flushed.
  2738   2738   */
  2739   2739   int sqlite3WalBeginReadTransaction(Wal *pWal, int *pChanged){
  2740   2740     int rc;                         /* Return code */
  2741   2741     int cnt = 0;                    /* Number of TryBeginRead attempts */
  2742   2742   
  2743   2743   #ifdef SQLITE_ENABLE_SNAPSHOT

Changes to src/wherecode.c.

   880    880   ** an access of the index rather than the original table.
   881    881   */
   882    882   static int codeCursorHintFixExpr(Walker *pWalker, Expr *pExpr){
   883    883     int rc = WRC_Continue;
   884    884     struct CCurHint *pHint = pWalker->u.pCCurHint;
   885    885     if( pExpr->op==TK_COLUMN ){
   886    886       if( pExpr->iTable!=pHint->iTabCur ){
   887         -      Vdbe *v = pWalker->pParse->pVdbe;
   888    887         int reg = ++pWalker->pParse->nMem;   /* Register for column value */
   889    888         sqlite3ExprCode(pWalker->pParse, pExpr, reg);
   890    889         pExpr->op = TK_REGISTER;
   891    890         pExpr->iTable = reg;
   892    891       }else if( pHint->pIdx!=0 ){
   893    892         pExpr->iTable = pHint->iIdxCur;
   894    893         pExpr->iColumn = sqlite3ColumnOfIndex(pHint->pIdx, pExpr->iColumn);