From: shaneh <shaneh@noemail.net>
Date: Wed, 19 May 2010 23:41:55 +0000 (+0000)
Subject: Merge WIN32 WAL support into trunk.  Still some issues with locking to resolve.
X-Git-Tag: version-3.7.2~358
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c767e111377046177dd0666f271312ec25dd240;p=thirdparty%2Fsqlite.git

Merge WIN32 WAL support into trunk.  Still some issues with locking to resolve.

FossilOrigin-Name: 43377663fc3569c361867cdea19e8abaf91a163f
---

7c767e111377046177dd0666f271312ec25dd240
diff --cc manifest
index d50e19f9be,bdd18c520a..ff133e6842
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,5 @@@
-------BEGIN PGP SIGNED MESSAGE-----
--Hash: SHA1
--
- C Add\sthe\sSQLITE_FCNTL_SIZE_HINT\sto\sthe\sos_win.c\sVFS.
- D 2010-05-19T19:39:27
 -C Pull\sin\sall\sthe\slatest\schanges\sfrom\sthe\strunk.\nUpdate\sthe\swin32\sSHM\smethods\sto\swork\swith\sthe\snew\sinterface\sdesign.
 -D 2010-05-14T16:34:35
++C Merge\sWIN32\sWAL\ssupport\sinto\strunk.\s\sStill\ssome\sissues\swith\slocking\sto\sresolve.
++D 2010-05-19T23:41:55
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
  F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@@ -151,13 -151,13 +148,13 @@@ F src/mutex_os2.c 20477db50cf3817c2f1cd
  F src/mutex_unix.c becb8c4e07616abf84650d3687d62a1461d5d9cd
  F src/mutex_w32.c fb1cf87c5a88b56c7df0d9ddb796ed9641046c3d
  F src/notify.c cbfa66a836da3a51567209636e6a94059c137930
 -F src/os.c c0a5dfce2a214dacb679425632d04f8a2021f364
 -F src/os.h 8a7e2456237ecf3a2e55b02f9fe6091f1ad36902
 +F src/os.c b994b2f4c9a2c406a20d43b59c22ed39a1e704d1
 +F src/os.h 207c26793c9b518aa670480a3a262250dd3c98b1
  F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
  F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19
 -F src/os_unix.c 025da44ba18d91c2d0205e667bae4dd47be13639
 -F src/os_win.c e0a74dd60e5114ebafdd8372b0d037cb0e960176
 -F src/pager.c 1e163a82ae8405433dca559831caa06aafbba3b0
 +F src/os_unix.c 6db01eb2c87856f9c9ea40d497941c54ae1b27ff
- F src/os_win.c c067d6413e1d2317ea344db7fb2be78951964664
++F src/os_win.c 3c8cafd2444f26504cf7af0e5f51ea568f88a67d
 +F src/pager.c d3284a6bbedeaa4ef3f5668af309d4381df97618
  F src/pager.h 76466c3a5af56943537f68b1f16567101a0cd1d0
  F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
  F src/pcache.c ace8f6a5ecd4711cc66a1b23053be7109bd437cf
@@@ -816,14 -816,14 +813,7 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 2b7e3b4a30d6a7c4a8a4b8e7dd2ed728b565c96d
- R 2466b0dbedf7ebb9f7be20dc6481e89a
 -P 76504726a1ef7f6a0445ec800776462138b22d72 d1debe5def82a6bc72f11b8787176ac60259630f
 -R a9795407fa84d51fbed2fe19974b207a
--U drh
- Z 654f705612d2bd15f3a9cb2813d9013b
 -Z d79712dbdc8aee8b22b73408f9d8d19b
-------BEGIN PGP SIGNATURE-----
--Version: GnuPG v1.4.6 (GNU/Linux)
--
- iD8DBQFL9D5yoxKgR168RlERAiQtAJ9+7x5S4d280D6+U6vPNBUwvl0C6gCfSYLq
- EhgqhDu2zSa8Zcq3UiPd1Tw=
- =r2eo
 -iD8DBQFL7XueoxKgR168RlERAmQDAJ9A6pB3LSLevi49j5UgkI8P8vCmtQCaAs3i
 -afk+KXni4+86rCQ2tTbJWk8=
 -=dADp
-------END PGP SIGNATURE-----
++P 9894118d20c08951565c2096552d4a3d2413f7b0 4b69f2cd315b6b66d10e5190d235114788853258
++R 22474bd221ea73384053085c0e088ad7
++U shaneh
++Z 2a837cc3f84e5ea75aa515c136d3a5d4
diff --cc manifest.uuid
index e0f9467970,eff35a07a1..4e637cad8a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9894118d20c08951565c2096552d4a3d2413f7b0
 -4b69f2cd315b6b66d10e5190d235114788853258
++43377663fc3569c361867cdea19e8abaf91a163f