From: drh <drh@noemail.net>
Date: Tue, 21 Aug 2012 17:46:18 +0000 (+0000)
Subject: Merge in all the latest trunk changes.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90c9f698921b9997df57dcef3e7250e6f3e5a22f;p=thirdparty%2Fsqlite.git

Merge in all the latest trunk changes.

FossilOrigin-Name: 45cdc32f1e4d33959108dac94f551a4b8030424d
---

90c9f698921b9997df57dcef3e7250e6f3e5a22f
diff --cc manifest
index 753fcbc317,25c6e732c0..38f14093c3
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Changes\sto\sthe\sthread\sroutines\sto\sdisable\sthem\swhen\sthreading\sis\sturned\noff\susing\ssqlite3_config().
- D 2012-08-20T12:36:53.934
 -C Update\sthe\sspellfix\svirtual\stable\sso\sthat\sall\sOOM\serrors\sare\sreported\sout\nto\sthe\sapplication.
 -D 2012-08-21T17:44:05.685
++C Merge\sin\sall\sthe\slatest\strunk\schanges.
++D 2012-08-21T17:46:18.408
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 +F Makefile.in adec39f15a9c7000f634b87a535b95279b0cbd09
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc abd0ffddd856f9251a563cfa5e430a046d73e359
 -F Makefile.msc e89bdb795a841e58169ef9e26e543096dfc17c24
++F Makefile.msc d2f83cd5e74d54f9e3bcd7a505ca5b356d7e7c68
  F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@@ -162,8 -162,8 +162,8 @@@ F src/notify.c 976dd0f6171d4588e89e874f
  F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
  F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
- F src/os_unix.c d7c96b5d140f550f07345870112fae5d7ef99757
- F src/os_win.c 904f85152f806084826f5e6d7aae05d3cf4dc5d1
+ F src/os_unix.c b5149a3343a6acd6c9df4e3acf5085a6501c1f68
 -F src/os_win.c b8fc659987a678c7924796585f5ae293ba5c896d
++F src/os_win.c a7878531bf2c592218266f139d152cbe648fcc05
  F src/pager.c e381c118b77dc22021a1a59d3fec24815e91df78
  F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
  F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
@@@ -178,9 -178,9 +178,9 @@@ F src/resolve.c b3c70ab28cac60de33684c9
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
  F src/select.c a365da6d7a6d7d8a10ad60ca71837ab5e9369466
  F src/shell.c 076e1c90d594644f36027c8ecff9a392cf2d3a06
- F src/sqlite.h.in 3e8035bc406b1571a5cc8ea46bcc831201676f1a
+ F src/sqlite.h.in f664797c68ced43c2ea2c541d4ec8e1e04ec68ac
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
 -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
@@@ -1011,7 -1011,7 +1012,7 @@@ F tool/vdbe-compress.tcl d70ea6d8a19e35
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P 11dd05e5984f0d5f98052458b94cbaf7d18c2e8f
- R e58875d0291e3b6cc3052f8dc1dd2fc4
 -P e799222f3b8246e65657a758437914ece7069ba9
 -R 5e828b4451d9abd5424b5fdb18a303b8
++P 555fc07efd1a1bc597804dcacbbcd95e88e75e90 573770f5a66fa4d708931b30350149eb739da607
++R 6a248acc2b1ad3eddb9f82f26a87ebb7
  U drh
- Z bfd5ab54b6ff0aae15c2187f1069c92e
 -Z 86d779defb1a86a95d6cf62943de67e6
++Z eefdd7d4c689b509af3b4731cefe3c98
diff --cc manifest.uuid
index e0693a6aeb,4aa121d156..c3f2313a3a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 555fc07efd1a1bc597804dcacbbcd95e88e75e90
 -573770f5a66fa4d708931b30350149eb739da607
++45cdc32f1e4d33959108dac94f551a4b8030424d