From: drh <drh@noemail.net>
Date: Fri, 18 Nov 2011 13:10:51 +0000 (+0000)
Subject: Change the multiplexor to use a 3-digit suffix.
X-Git-Tag: version-3.7.10~19^2~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e4461b26150ccf96a19ded631d92a30f92b6711;p=thirdparty%2Fsqlite.git

Change the multiplexor to use a 3-digit suffix.

FossilOrigin-Name: 0b7edc44757660c8a5ae3b91cbcc3e6afd419b28
---

5e4461b26150ccf96a19ded631d92a30f92b6711
diff --cc manifest
index aa26307489,3a42d47788..bf28f8bbf8
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Improvements\sto\sthe\sdocumentation\sof\sthe\ssqlite3_db_filename()\sinterface.
- D 2011-11-17T11:49:58.484
 -C Change\sthe\smultiplexor\ssuffix\sfrom\s2\sto\s3\sdigits.
 -D 2011-11-16T17:32:28.704
++C Change\sthe\smultiplexor\sto\suse\sa\s3-digit\ssuffix.
++D 2011-11-18T13:10:51.946
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -214,7 -214,7 +214,7 @@@ F src/test_intarray.h 489edb9068bb92658
  F src/test_journal.c 03313c693cca72959dcaaf79f8d76f21c01e19ff
  F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
  F src/test_malloc.c 8d416f29ad8573f32601f6056c9d2b17472e9ad5
- F src/test_multiplex.c 3fc368022c46fe44ec22c5e1ed727223a54a6a1d
 -F src/test_multiplex.c 6a65dd5006117d26718110a8e00b0118aa5c98a1
++F src/test_multiplex.c 185378cade15fa9012bd17d9d5b04783d4478f79
  F src/test_multiplex.h e99c571bc4968b7a9363b661481f3934bfead61d
  F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
  F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec
@@@ -976,7 -975,10 +976,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 4d3cf9e1d8ac356db5a708913f614e42a6a56b94
- R daa1b38027d3a49fc0c491c85b1f5a39
 -P a5418c7fc216a30abf7b2fa8c579aee586393a91
 -R 6f660080d5c293528a113cc8cdb20026
 -T *branch * 3-digit-multiplex-suffix
 -T *sym-3-digit-multiplex-suffix *
 -T -sym-trunk *
++P 1c45b2a0c055f6fc5da9d00ae2e9171099d904d4 06e0cdaf9112f722c23692e25c5b1f99b61c2d78
++R d62e550a3406a1fdeec14ac20b144781
  U drh
- Z f65f1ce31dbae92bc408999ba5cab4af
 -Z 8b5e0625a534e1e664db241b7f45d292
++Z d184ad6817e342a5dbefa36cc13c5962
diff --cc manifest.uuid
index 261f1cf6ad,71507368b9..deaed3cb30
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1c45b2a0c055f6fc5da9d00ae2e9171099d904d4
 -06e0cdaf9112f722c23692e25c5b1f99b61c2d78
++0b7edc44757660c8a5ae3b91cbcc3e6afd419b28
diff --cc src/test_multiplex.c
index 5d29607acb,334024fc1e..2ca8bf8d5d
--- a/src/test_multiplex.c
+++ b/src/test_multiplex.c
@@@ -96,26 -96,14 +96,16 @@@
  # define SQLITE_MULTIPLEX_CHUNK_SIZE 2147418112
  #endif
  
- /* Default limit on number of chunks.  Care should be taken
- ** so that values for chunks numbers fit in the SQLITE_MULTIPLEX_EXT_FMT
- ** format specifier. It may be changed by calling
 -/* Default limit on number of chunks.
 -** May be changed by calling
--** the xFileControl() interface.
++/* This used to be the default limit on number of chunks, but
++** it is no longer enforced.  There is currently no limit to the
++** number of chunks.
++**
++** May be changed by calling the xFileControl() interface.
  */
  #ifndef SQLITE_MULTIPLEX_MAX_CHUNKS
--# define SQLITE_MULTIPLEX_MAX_CHUNKS 32
++# define SQLITE_MULTIPLEX_MAX_CHUNKS 12
  #endif
  
- /* If SQLITE_MULTIPLEX_EXT_OVWR is defined, the 
- ** last SQLITE_MULTIPLEX_EXT_SZ characters of the 
- ** filename will be overwritten, otherwise, the 
- ** multiplex extension is simply appended to the filename.
- ** Ex.  (undefined) test.db -> test.db01
- **      (defined)   test.db -> test.01
- ** Chunk 0 does not have a modified extension.
- */
- #define SQLITE_MULTIPLEX_EXT_FMT    "%02d"
- #define SQLITE_MULTIPLEX_EXT_SZ     2
- 
  /************************ Object Definitions ******************************/
  
  /* Forward declaration of all object types */