Merge changes for the new sqlite3_file_control() that will cause the -wal and -shm...

FossilOrigin-Name: 1b56677bdfb102d070a2057a65ba424fec81131d

diff --cc manifest
index 1cfb86f6a1d6ead390d0659043c079abe06aca56,afa1dda3c6cd2b1adc7ea3f2e8df9ac91608917c..da1057fbbe7d2ec02f988c0f9918f0d5e08ade98
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\sredundant\ssub-expression\sfrom\sretry\sloop\sinvariant\sin\swinAccess.\s\sAlso,\smake\scheck\sfor\sSQLITE_ACCESS_READWRITE\sformally\scorrect.
- D 2011-07-28T19:16:41.062
 -C Test\scases\sadded.\s\sFix\sthe\squery\smode.
 -D 2011-07-26T16:23:25.835
++C Merge\schanges\sfor\sthe\snew\ssqlite3_file_control()\sthat\swill\scause\sthe\s-wal\sand\s-shm\sfiles\sto\spersist\safter\sthe\slast\sdatabase\sconnection\scloses.
++D 2011-07-28T20:48:38.832
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -165,8 -165,8 +165,8 @@@ F src/os.c fcc717427a80b2ed225373f07b64
  F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
  F src/os_common.h 65a897143b64667d23ed329a7984b9b405accb58
  F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
- F src/os_unix.c c617801bbe9a2233ceca4c3e3b8f5faedf955878
- F src/os_win.c f79cb7c31cc82532f625313d9f29359931dd2ed7
 -F src/os_unix.c 637fa969213812ba92f1f3c54e4be967bda60a13
 -F src/os_win.c 7dd45f72a6c6ae5a985865b440ebd14d8ee7b874
++F src/os_unix.c 51caec436f811fa387a85cf7b05f13962c7fe0dc
++F src/os_win.c 60af92b1b1cc7aee13f5e0b5f9dde2d7abb41354
  F src/pager.c 120550e7ef01dafaa2cbb4a0528c0d87c8f12b41
  F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
  F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
@@@ -952,7 -953,7 +953,7 @@@ F tool/symbols.sh caaf6ccc7300fd4335331
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
- P 8a145863d1a8711953ae72d706404fb96f6fec06
- R c93000a51b03c9223d1343b66dc15be8
 -P e34c553bf04761e86f3bd72f91439c05886caa5c
 -R 19cfffdeb7e8194e5c58a90ee9f2b26d
 -U drh
 -Z c92a162aecc6522b9f0c0715256a714d
++P 93079a92c49edf72eb289f352cd5ed7ab2faaff3 a9d8794ae949df570466a84836882bc8bed95c7c
++R e027707f27957f6e6a59d5fffc14bff5
 +U mistachkin
- Z 63cb8d3f96a5697becf5d48d5fb1787f
++Z 03c4de519e387b889b617972ba4102a3

diff --cc manifest.uuid
index 3763b8717fbf8b793cd5f082cba1af3d4b6132cd,1a4145a1d2f0f297d81fb124bf4577db4e0b0381..961da9f06ba5e5cfb13525229d4d92edfbbb9251
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 93079a92c49edf72eb289f352cd5ed7ab2faaff3
 -a9d8794ae949df570466a84836882bc8bed95c7c
++1b56677bdfb102d070a2057a65ba424fec81131d

diff --cc src/os_unix.c
Simple merge

diff --cc src/os_win.c
Simple merge