/ Check-in [8534a46c]
Login

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

Overview
Comment:Fix typos in requirements text and update requirements marks. No changes to code.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:8534a46c06601ad35b97caee442371f24c718d0f
User & Date: drh 2015-12-03 22:33:55
Context
2015-12-04
03:27
Prevent a segfault on Solaris in the test_fs.c due to differences in the definition of the dirent object. check-in: 042738ad user: drh tags: trunk
2015-12-03
22:33
Fix typos in requirements text and update requirements marks. No changes to code. check-in: 8534a46c user: drh tags: trunk
21:47
Improved OOM recovery in the SELECT code generator logic. check-in: e6521a43 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/main.c.

   441    441         ** allocation (sz), and the maximum number of scratch allocations (N). */
   442    442         sqlite3GlobalConfig.pScratch = va_arg(ap, void*);
   443    443         sqlite3GlobalConfig.szScratch = va_arg(ap, int);
   444    444         sqlite3GlobalConfig.nScratch = va_arg(ap, int);
   445    445         break;
   446    446       }
   447    447       case SQLITE_CONFIG_PAGECACHE: {
   448         -      /* EVIDENCE-OF: R-31408-40510 There are three arguments to
   449         -      ** SQLITE_CONFIG_PAGECACHE: A pointer to 8-byte aligned memory, the size
   450         -      ** of each page buffer (sz), and the number of pages (N). */
          448  +      /* EVIDENCE-OF: R-18761-36601 There are three arguments to
          449  +      ** SQLITE_CONFIG_PAGECACHE: A pointer to 8-byte aligned memory (pMem),
          450  +      ** the size of each page cache line (sz), and the number of cache lines
          451  +      ** (N). */
   451    452         sqlite3GlobalConfig.pPage = va_arg(ap, void*);
   452    453         sqlite3GlobalConfig.szPage = va_arg(ap, int);
   453    454         sqlite3GlobalConfig.nPage = va_arg(ap, int);
   454    455         break;
   455    456       }
   456    457       case SQLITE_CONFIG_PCACHE_HDRSZ: {
   457    458         /* EVIDENCE-OF: R-39100-27317 The SQLITE_CONFIG_PCACHE_HDRSZ option takes

Changes to src/resolve.c.

   324    324                 iCol = -1;
   325    325               }
   326    326               break;
   327    327             }
   328    328           }
   329    329           if( iCol>=pTab->nCol && sqlite3IsRowid(zCol) && VisibleRowid(pTab) ){
   330    330             /* IMP: R-51414-32910 */
   331         -          /* IMP: R-44911-55124 */
   332    331             iCol = -1;
   333    332           }
   334    333           if( iCol<pTab->nCol ){
   335    334             cnt++;
   336    335             if( iCol<0 ){
   337    336               pExpr->affinity = SQLITE_AFF_INTEGER;
   338    337             }else if( pExpr->iTable==0 ){
................................................................................
   359    358        && cntTab==1
   360    359        && pMatch
   361    360        && (pNC->ncFlags & NC_IdxExpr)==0
   362    361        && sqlite3IsRowid(zCol)
   363    362        && VisibleRowid(pMatch->pTab)
   364    363       ){
   365    364         cnt = 1;
   366         -      pExpr->iColumn = -1;     /* IMP: R-44911-55124 */
          365  +      pExpr->iColumn = -1;
   367    366         pExpr->affinity = SQLITE_AFF_INTEGER;
   368    367       }
   369    368   
   370    369       /*
   371    370       ** If the input is of the form Z (not Y.Z or X.Y.Z) then the name Z
   372    371       ** might refer to an result-set alias.  This happens, for example, when
   373    372       ** we are resolving names in the WHERE clause of the following command:

Changes to src/sqlite.h.in.

   883    883   ** is intended for diagnostic use only.
   884    884   **
   885    885   ** <li>[[SQLITE_FCNTL_VFS_POINTER]]
   886    886   ** ^The [SQLITE_FCNTL_VFS_POINTER] opcode finds a pointer to the top-level
   887    887   ** [VFSes] currently in use.  ^(The argument X in
   888    888   ** sqlite3_file_control(db,SQLITE_FCNTL_VFS_POINTER,X) must be
   889    889   ** of type "[sqlite3_vfs] **".  This opcodes will set *X
   890         -** to a pointer to the top-level VFS.^)
          890  +** to a pointer to the top-level VFS.)^
   891    891   ** ^When there are multiple VFS shims in the stack, this opcode finds the
   892    892   ** upper-most shim only.
   893    893   **
   894    894   ** <li>[[SQLITE_FCNTL_PRAGMA]]
   895    895   ** ^Whenever a [PRAGMA] statement is parsed, an [SQLITE_FCNTL_PRAGMA] 
   896    896   ** file control is sent to the open [sqlite3_file] object corresponding
   897    897   ** to the database file to which the pragma statement refers. ^The argument

Changes to test/pragma2.test.

   121    121         PRAGMA aux.freelist_count;
   122    122       }
   123    123     } {9 9}
   124    124   }
   125    125   
   126    126   # Default setting of PRAGMA cache_spill is always ON
   127    127   #
   128         -# EVIDENCE-OF: R-51036-62828 PRAGMA cache_spill; PRAGMA
   129         -# cache_spill=boolean;
          128  +# EVIDENCE-OF: R-63549-59887 PRAGMA cache_spill; PRAGMA
          129  +# cache_spill=boolean; PRAGMA schema.cache_spill=N;
   130    130   #
   131    131   # EVIDENCE-OF: R-23955-02765 Cache_spill is enabled by default
   132    132   #
   133    133   db close
   134    134   delete_file test.db test.db-journal
   135    135   delete_file test2.db test2.db-journal
   136    136   sqlite3 db test.db
................................................................................
   186    186       PRAGMA cache_spill=OFF;
   187    187       PRAGMA Cache_Spill;
   188    188       BEGIN;
   189    189       UPDATE t1 SET c=c+1;
   190    190       PRAGMA lock_status;
   191    191     }
   192    192   } {0 main reserved temp unknown}   ;# No cache spill, so no exclusive lock
          193  +
          194  +
          195  +# EVIDENCE-OF: R-34657-61226 The "PRAGMA cache_spill=N" form of this
          196  +# pragma sets a minimum cache size threshold required for spilling to
          197  +# occur.
   193    198   do_test pragma2-4.5.2 {
   194    199     db eval {
   195    200       ROLLBACK;
   196    201       PRAGMA cache_spill=100000;
   197    202       PRAGMA cache_spill;
   198    203       BEGIN;
   199    204       UPDATE t1 SET c=c+1;