Improved support for OSTRACE on Windows.

FossilOrigin-Name: ca43812bde499a23244e2860d3ceddc97d29f09e

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index a6b688dba61f0e91f9be1d1b1e4c9d8b02b62770,8adcf63f4da7ff7ea2fd43201ff6d68c38a89c09..ae2d884573d083a0b10f358b77ee6720ac1877e4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Update\sthe\stest/fuzzdata1.txt\sfile\swith\sthe\slatest\scases\sdiscovered\sby\sAFL.
- D 2015-04-28T14:49:41.338
 -C Revise\swhen\sthe\ssqlite3ErrName()\sfunction\sis\sdefined.
 -D 2015-04-28T23:34:10.625
++C Improved\ssupport\sfor\sOSTRACE\son\sWindows.
++D 2015-04-29T00:35:07.945
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
 +F Makefile.in e3268d234210842b4be0a6e2e1c5990999f1d9f4
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 0f859a8bbda8b3876ed2f257281db26ba9ad8398
 -F Makefile.msc 29e11e91c4abf13c522b983552fac18422519321
++F Makefile.msc d80278757ef0b02d797d6ab98e07baf9c608b1a2
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 2e244662b71e6e68a5c29b014ebc5b7564f4cc5a
@@@ -212,30 -212,30 +212,30 @@@ F src/mutex_w32.c 61660ada28d8308ad190f
  F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
  F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
- F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
+ F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 5ed7e2e453c2980909a6b2c80dc55764b50819a8
- F src/os_win.c 03d27be3a20048ef52a648d5f0a15f5edda9f2a3
+ F src/os_unix.c cf45d7b1cd27341ba8699e62c4902062b6297039
+ F src/os_win.c c2f0b0b3541906e310588b9e95080df4df75b674
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c
 +F src/pager.c 5283581c8ce8950ff483a0b3a3cab9cb4d25a21e
  F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77
 -F src/parse.y 1299c66e7b1707322ccd8af43a359b8fb0d46d72
 +F src/parse.y c4e0387bc88c8e21e5ba653e2578959a1f3cdbc7
  F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
  F src/pcache1.c 69d137620a305f814398bd29a0c998038c0695e9
 -F src/pragma.c 3965ae4e82bed39fb97ce04c5fe18c9bc3ee6a88
 +F src/pragma.c c1f4d012ea9f6b1ce52d341b2cd0ad72d560afd7
  F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
  F src/prepare.c 1fffbdcd6f8a0173a8f70d71f22528f4c0e1e3d3
- F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
+ F src/printf.c 18df0da8c343dc4380f27a803858f2a4b81f1824
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 -F src/resolve.c 66cfe49a9c3b449ef13b89a8c47036a4ed167eab
 +F src/resolve.c 13109bc3b5ab404446296efa17039640de5bc35d
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 -F src/select.c 93260bc9e7e0e6dfe1b7cb8815b0ed4cad8be9e3
 -F src/shell.c 72b61a9d41ba12b67ea06fe9267abcc012c6c5bb
 +F src/select.c 35433ea8894ac42594ddc31eb0165a6d6401cfe5
 +F src/shell.c 78eabce4c16c45e36fea2368f95118116399ba8a
  F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 8abcea1295138f10ef8f7ed38db5f1b573b93ece
 -F src/sqliteInt.h 5a4e0ae0ce02acb1cadb783abd70af800f538cba
++F src/sqliteInt.h d6b2e99b3dd3f51ccc4b7c568d8b529d0fd5d07c
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -1255,7 -1250,7 +1255,8 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 36e515261825be60ffdc73d13340d77cf377e8e1
- R db2aae636d49245c4e56d8069299efc5
 -P c37f4d492f98ac5c07c08705a3826a3e86107306
 -R f96d406cf134e6be926fdb343dc33ea3
 -U mistachkin
 -Z 0af972753cfc85d551aad5ddaa27fa03
++P f2063f5320f5a5d884f9c931eb91b7cc94945b92 9e593fb3dbc58e86f499ba4399530e3e760eb84d
++R 50bbfdab6cd5db4348f928cc10df10af
++T +closed 9e593fb3dbc58e86f499ba4399530e3e760eb84d
 +U drh
- Z 6bb01ba2e8fe64ed97342e20664c6298
++Z 2fc3b10b7831d47e1437f4606a69806e

diff --cc manifest.uuid
index ea891cf9a3dce5dbd94cda151a38c4fecf49af19,fc8716e2eabd13bd10e5c0a95078769fc8fb9644..6baed05a2b4f8bdc4c076665f33bc1c55659a591
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f2063f5320f5a5d884f9c931eb91b7cc94945b92
 -9e593fb3dbc58e86f499ba4399530e3e760eb84d
++ca43812bde499a23244e2860d3ceddc97d29f09e

diff --cc src/sqliteInt.h
Simple merge