Improvements to comments. No code changes.

FossilOrigin-Name: 08bbbd8e38697908ab8ae0f6b512d01c32f7e4da

diff --git a/manifest b/manifest
index 82b9fafa495158f458444b2aafb06770634a9678..03d497d4df8b0a760e79335fc6dc11245f46c274 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\shard\slimit\sto\sthe\snumber\sof\schunks\sa\smultiplexed\sdatabase\smay\sconsist\sof\sif\sENABLE_8_3_NAMES\sis\sdefined.
-D 2011-12-13T19:03:34.498
+C Improvements\sto\scomments.\s\sNo\scode\schanges.
+D 2011-12-14T01:38:12.485
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -214,7 +214,7 @@ F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
 F src/test_journal.c 03313c693cca72959dcaaf79f8d76f21c01e19ff
 F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
 F src/test_malloc.c 8d416f29ad8573f32601f6056c9d2b17472e9ad5
-F src/test_multiplex.c 10f881e4508976d970569fe0e7779bfec17907e5
+F src/test_multiplex.c a61af1bd64a78429c87c79d870bf681b66e7e025
 F src/test_multiplex.h e99c571bc4968b7a9363b661481f3934bfead61d
 F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
 F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec
@@ -978,7 +978,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 8e65b9132530e46c62bd1352bfc2e9c29f57af5f
-R 72e3acbb02cd24af246addd5a37e5bd0
-U dan
-Z bb7ad67fc331d74f2be1df794e13fcc3
+P 43a1264088c57bf598787b7a9f5d7a2536603d67
+R bccaf9dcf75a81906ae2a631899b3b9f
+U drh
+Z 311819ae6733da4a29af5f18337fa8de

diff --git a/manifest.uuid b/manifest.uuid
index 97f853f6e501ade96c3bf3992be95f060ab0bc88..38fadc9ea8d8918d93326ba1987faa4182f6dcdd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-43a1264088c57bf598787b7a9f5d7a2536603d67
\ No newline at end of file
+08bbbd8e38697908ab8ae0f6b512d01c32f7e4da
\ No newline at end of file

diff --git a/src/test_multiplex.c b/src/test_multiplex.c
index 85b63b48f4ae91aaa27e7282b7dedf84d5461c45..c4aeca81b5bc8acf0f71357303270a4dcd75bda0 100644 (file)
--- a/src/test_multiplex.c
+++ b/src/test_multiplex.c
@@ -81,6 +81,7 @@
 #define sqlite3_mutex_notheld(X)  ((void)(X),1)
 #endif /* SQLITE_THREADSAFE==0 */
 
+/* First chunk for rollback journal files */
 #define SQLITE_MULTIPLEX_JOURNAL_8_3_OFFSET 400
 
 
@@ -243,8 +244,8 @@ static int multiplexSubFilename(multiplexGroup *pGroup, int iChunk){
       if( i>=n-4 ) n = i+1;
       if( pGroup->flags & (SQLITE_OPEN_MAIN_JOURNAL|SQLITE_OPEN_TEMP_JOURNAL) ){
         /* The extensions on overflow files for main databases are 001, 002,
-        ** 003 and so forth.  To avoid name collisions, add 100 to the 
-        ** extensions of journal files so that they are 101, 102, 103, ....
+        ** 003 and so forth.  To avoid name collisions, add 400 to the 
+        ** extensions of journal files so that they are 401, 402, 403, ....
         */
         iChunk += SQLITE_MULTIPLEX_JOURNAL_8_3_OFFSET;
       }
@@ -268,10 +269,10 @@ static sqlite3_file *multiplexSubOpen(
   sqlite3_vfs *pOrigVfs = gMultiplex.pOrigVfs;        /* Real VFS */
 
 #ifdef SQLITE_ENABLE_8_3_NAMES
-  /* If JOURNAL_8_3_OFFSET is set to (say) 500, then any overflow files are 
-  ** part of a database journal are named db.501, db.502, and so on. A 
-  ** database may therefore not grow to larger than 500 chunks. Attempting
-  ** to open chunk 501 indicates the database is full. */
+  /* If JOURNAL_8_3_OFFSET is set to (say) 400, then any overflow files are 
+  ** part of a database journal are named db.401, db.402, and so on. A 
+  ** database may therefore not grow to larger than 400 chunks. Attempting
+  ** to open chunk 401 indicates the database is full. */
   if( iChunk>=SQLITE_MULTIPLEX_JOURNAL_8_3_OFFSET ){
     *rc = SQLITE_FULL;
     return 0;