Update the threads branch to include all the latest trunk changes.

FossilOrigin-Name: f4125771e21f1ca29d5442b5441dacfc06b8032b

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index e4cf469b1384709c73331381229626ab1f4c031c,ed0976d6a5c70cc486886ecfa326e990caa6492b..8609fc77513ab66acc38cfc5bcb5069b70fb77f4
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Add\san\sassert()\sto\shelp\sverify\sthe\sreturn\scode\sfrom\sthe\sWin32\sthread\swait\sfunction.
- D 2012-07-23T06:47:30.102
 -C Changes\sto\sthe\sspellfix\stest\sscript\sto\smake\sthe\sresults\sdeterministic.
 -D 2012-08-15T16:43:07.389
++C Update\sthe\sthreads\sbranch\sto\sinclude\sall\sthe\slatest\strunk\schanges.
++D 2012-08-16T11:24:22.980
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 7a89f9692d1369faa4071310164ffba0504c324d
 -F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
++F Makefile.in adec39f15a9c7000f634b87a535b95279b0cbd09
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 332c166048570b65127db33450bca22c53b4f0a2
 -F Makefile.msc c1293ece66e237b545eae4484e3e81571fb5f47c
++F Makefile.msc abd0ffddd856f9251a563cfa5e430a046d73e359
  F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@@ -103,7 -103,7 +103,7 @@@ F ext/rtree/tkt3363.test 142ab96eded44a
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk dd63e2de89cdcb9be441e8f046a0acce3fbae2a8
 -F main.mk 72026405046ed5b1f0368943b89c0aa29ad558b6
++F main.mk a463acdf2898fed3ccd716ece9d3c5d28450c852
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -160,10 -160,10 +160,10 @@@ F src/mutex_unix.c c3a4e00f96ba068a8dbe
  F src/mutex_w32.c 32a9b3841e2d757355f0012b860b1bc5e01eafa0
  F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
  F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
- F src/os.h c2ebd26a68a4223fe170b003852b97d9e7211498
+ F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_unix.c d7c96b5d140f550f07345870112fae5d7ef99757
- F src/os_win.c f9f2a4569f9a6d2415170261641e6e3ee6ed8121
 -F src/os_win.c 370c6f3399e3cd9f14343fb7dc4b2bbe8619d3bf
++F src/os_win.c 904f85152f806084826f5e6d7aae05d3cf4dc5d1
  F src/pager.c e381c118b77dc22021a1a59d3fec24815e91df78
  F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
  F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
@@@ -176,11 -176,11 +176,11 @@@ F src/printf.c 4a9f882f1c1787a8b494a298
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
- F src/select.c f6c4833c4d8e94714761d99013d74f381e084f1d
+ F src/select.c a365da6d7a6d7d8a10ad60ca71837ab5e9369466
  F src/shell.c 076e1c90d594644f36027c8ecff9a392cf2d3a06
- F src/sqlite.h.in 310ae7e538883fa1619ab0638c775ce11ad43015
+ F src/sqlite.h.in 3e8035bc406b1571a5cc8ea46bcc831201676f1a
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 4bb99c73090cde71ea5534d0f9c3ee299a1c10e7
 -F src/sqliteInt.h c8169801f8bbfdf5873cc6fa45cb5df720c04db4
++F src/sqliteInt.h 1ef5f8b64d204fe5deec83c58297493b2f5fbfa0
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -979,10 -981,11 +982,11 @@@ F tool/lempar.c 01ca97f87610d1dac6d8cd9
  F tool/mkkeywordhash.c bb52064aa614e1426445e4b2b9b00eeecd23cc79
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 -F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
 -F tool/mksqlite3c.tcl 589c7f44e990be1b8443cfe4808dce392b0327fa
 +F tool/mksqlite3c-noext.tcl 752f1a9d3287f6c0ef5738b1c4add0b96fbe0854
 +F tool/mksqlite3c.tcl d4923e8e75b7710ddbe4eb37f83dda5eadef63d8
  F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8
  F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
+ F tool/mkvsix.tcl 19b2ab9ea16445953a76568a5bbe4cb864f92dfe
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
  F tool/omittest.tcl 4665982e95a6e5c1bd806cf7bc3dea95be422d77
  F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
@@@ -1006,7 -1009,8 +1010,8 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 049b04117353c3e163ffc87916cbe121403a2821
- R 8ad4cfcece99f2543c3fc25ff90ff8da
- U mistachkin
- Z c7ca4753dded1e68bd82c1792e2c5272
+ F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
 -P 772d0de3f311f2035f8a42f01371c96c9fa587ce
 -R 5cf52533788596320f4b8771261628f7
++P ed3dc7a89f3416622fcd741ae5fba437929d06d6 31c07db2560ee867723c41cdb634e2aa7993634d
++R 8983882407637c60aee542aa1d4c9bca
+ U drh
 -Z bf22097f18dc13a1f07a9f39f12dbcca
++Z 9b3c8e4e1baa5816be48b30862221038

diff --cc manifest.uuid
index acb6e11d72a6384d2c44e4b9a18bf72a6799a4b8,a265920d2bbc5d3deacb241ffff71e3e46ce9963..0a036ded258b3d1ecb19d4cbadab9aba440157e7
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ed3dc7a89f3416622fcd741ae5fba437929d06d6
 -31c07db2560ee867723c41cdb634e2aa7993634d
++f4125771e21f1ca29d5442b5441dacfc06b8032b

diff --cc src/os_win.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge