Fix typos in requirements text and update requirements marks. No changes

to code.

FossilOrigin-Name: 8534a46c06601ad35b97caee442371f24c718d0f

diff --git a/manifest b/manifest
index f20b0b8fdd1bb4d0de2415624300d4b0ab23949f..f2736d883dd8da70303e6deccd889eb70b0ba5e2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sOOM\srecovery\sin\sthe\sSELECT\scode\sgenerator\slogic.
-D 2015-12-03T21:47:30.716
+C Fix\stypos\sin\srequirements\stext\sand\supdate\srequirements\smarks.\s\sNo\schanges\nto\scode.
+D 2015-12-03T22:33:55.362
 F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e8fdca1cb89a1b58b5f4d3a130ea9a3d28cb314d
@@ -304,7 +304,7 @@ F src/insert.c e1d20ae8979e25519c2670233718676bedcfedc9
 F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/loadext.c 84996d7d70a605597d79c1f1d7b2012a5fd34f2b
-F src/main.c 3f2828fce1e45c3ad096c69eee1e96962c7281c5
+F src/main.c a950e48920e8c0f0ff82b2b2ccfe11aa89ca11d4
 F src/malloc.c 337bbe9c7d436ef9b7d06b5dd10bbfc8f3025972
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@ -337,11 +337,11 @@ F src/pragma.h 3d94aebbebd2089899fecc01909bf2608b39507d
 F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
 F src/printf.c ca05561795ad6c2fa47acdd007702586282f7feb
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
-F src/resolve.c f4c897ca76ca6d5e0b3f0499c627392ffe657c8e
+F src/resolve.c a83b41104e6ff69855d03cd0aaa09e93927ec39f
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 F src/select.c f8fded11fc443a9f5a73cc5db069d06b34460e2f
 F src/shell.c 2796237990d42e6a5a7beafee65ef70cc8767d21
-F src/sqlite.h.in 5bd83191711d3dc85030326daa9e8e5226a495e7
+F src/sqlite.h.in 1248a78548024bdc8ef5893faa0ff9552b4cceb4
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
 F src/sqliteInt.h 64256d193a16a147d9f6317cc4e095fdd3e0a2e9
@@ -934,7 +934,7 @@ F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 F test/permutations.test 4ea119731c62d2f7d0aa86dd5b184cbb61ca411b
 F test/pragma.test a44253f911e7d50127d4a08f927f47c861a4c772
-F test/pragma2.test 00065068eeab2d15ea55465ec0f1e0a70e2c369e
+F test/pragma2.test a9400a7289605280576098b97f5cde3f204075c0
 F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
 F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
 F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
@@ -1408,7 +1408,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 06338201f3f00151232e5c6a40edcdbea04d7553
-R 145702191e68cee758981a8fb775b160
+P e6521a436d464a42b87a7d5ba5cc98235b92440a
+R 846383f75bcba4c7d26192303dc02f09
 U drh
-Z 9a3c93cbb014714fd53297dd3e278abb
+Z be77de4336a8b095fa17ae32142959b3

diff --git a/manifest.uuid b/manifest.uuid
index f6d2d01ac47107c95087c7a128901abd0d7ca439..1f813c303c4115563f17cb723401a6987b204786 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e6521a436d464a42b87a7d5ba5cc98235b92440a
\ No newline at end of file
+8534a46c06601ad35b97caee442371f24c718d0f
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 2bcecdb78b0a859c51a190a0f35413644e193109..d552f7fbc87c66751fa519ef4cd9fe586120966c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -445,9 +445,10 @@ int sqlite3_config(int op, ...){
       break;
     }
     case SQLITE_CONFIG_PAGECACHE: {
-      /* EVIDENCE-OF: R-31408-40510 There are three arguments to
-      ** SQLITE_CONFIG_PAGECACHE: A pointer to 8-byte aligned memory, the size
-      ** of each page buffer (sz), and the number of pages (N). */
+      /* EVIDENCE-OF: R-18761-36601 There are three arguments to
+      ** SQLITE_CONFIG_PAGECACHE: A pointer to 8-byte aligned memory (pMem),
+      ** the size of each page cache line (sz), and the number of cache lines
+      ** (N). */
       sqlite3GlobalConfig.pPage = va_arg(ap, void*);
       sqlite3GlobalConfig.szPage = va_arg(ap, int);
       sqlite3GlobalConfig.nPage = va_arg(ap, int);

diff --git a/src/resolve.c b/src/resolve.c
index b3e887778d446b0c20808756a7df0e3a557f7609..bb6646256a0fc4a0d50b5dc131aa5ef7fa288365 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -328,7 +328,6 @@ static int lookupName(
         }
         if( iCol>=pTab->nCol && sqlite3IsRowid(zCol) && VisibleRowid(pTab) ){
           /* IMP: R-51414-32910 */
-          /* IMP: R-44911-55124 */
           iCol = -1;
         }
         if( iCol<pTab->nCol ){
@@ -363,7 +362,7 @@ static int lookupName(
      && VisibleRowid(pMatch->pTab)
     ){
       cnt = 1;
-      pExpr->iColumn = -1;     /* IMP: R-44911-55124 */
+      pExpr->iColumn = -1;
       pExpr->affinity = SQLITE_AFF_INTEGER;
     }
 

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 6ad3da5df2f1ecbe41a3ba2cada954fb3e6ce22f..e79757106272f955133965f188b38a5397431328 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -887,7 +887,7 @@ struct sqlite3_io_methods {
 ** [VFSes] currently in use.  ^(The argument X in
 ** sqlite3_file_control(db,SQLITE_FCNTL_VFS_POINTER,X) must be
 ** of type "[sqlite3_vfs] **".  This opcodes will set *X
-** to a pointer to the top-level VFS.^)
+** to a pointer to the top-level VFS.)^
 ** ^When there are multiple VFS shims in the stack, this opcode finds the
 ** upper-most shim only.
 **

diff --git a/test/pragma2.test b/test/pragma2.test
index 64b396bd1fa26f47abea4f24cdbed547088f2459..a4fb2ce657a187153ad3e7cda72466df8e627507 100644 (file)
--- a/test/pragma2.test
+++ b/test/pragma2.test
@@ -125,8 +125,8 @@ ifcapable attach {
 
 # Default setting of PRAGMA cache_spill is always ON
 #
-# EVIDENCE-OF: R-51036-62828 PRAGMA cache_spill; PRAGMA
-# cache_spill=boolean;
+# EVIDENCE-OF: R-63549-59887 PRAGMA cache_spill; PRAGMA
+# cache_spill=boolean; PRAGMA schema.cache_spill=N;
 #
 # EVIDENCE-OF: R-23955-02765 Cache_spill is enabled by default
 #
@@ -190,6 +190,11 @@ do_test pragma2-4.5.1 {
     PRAGMA lock_status;
   }
 } {0 main reserved temp unknown}   ;# No cache spill, so no exclusive lock
+
+
+# EVIDENCE-OF: R-34657-61226 The "PRAGMA cache_spill=N" form of this
+# pragma sets a minimum cache size threshold required for spilling to
+# occur.
 do_test pragma2-4.5.2 {
   db eval {
     ROLLBACK;