From: drh <drh@noemail.net>
Date: Tue, 22 May 2012 17:39:00 +0000 (+0000)
Subject: Merge the 3.7.12.1 trunk changes into the WinRT branch.
X-Git-Tag: version-3.7.13~11^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba67e31752e611b7d582624ede8c46d6c8582477;p=thirdparty%2Fsqlite.git

Merge the 3.7.12.1 trunk changes into the WinRT branch.

FossilOrigin-Name: b9ed0b26debd225a4530eb17d25b857e8e883a85
---

ba67e31752e611b7d582624ede8c46d6c8582477
diff --cc manifest
index fe1e3bd3bf,a2de57fcf1..84520301da
--- a/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\supdates\sfrom\strunk.
- D 2012-05-17T21:04:26.516
 -C Version\s3.7.12.1
 -D 2012-05-22T02:45:53.459
++C Merge\sthe\s3.7.12.1\strunk\schanges\sinto\sthe\sWinRT\sbranch.
++D 2012-05-22T17:39:00.851
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
 +F Makefile.msc f1450260e62a44bdd5fbb4f11389505167188df9
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION f9313d88cb77df8617059a88eb382291321ef6bc
+ F VERSION 1e25ebddd2ed5811c10bdabe914cd46d2dc38af8
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -121,13 -121,13 +121,13 @@@ F src/btmutex.c 976f45a12e37293e32cae02
  F src/btree.c df800f10896bc2ddaa1125c532d6e7a7b9efc532
  F src/btree.h 48a013f8964f12d944d90e4700df47b72dd6d923
  F src/btreeInt.h 38a639c0542c29fe8331a221c4aed0cb8686249e
- F src/build.c 95fd8aa1bf81acf15e9ef46b07d1f70111ea88d0
+ F src/build.c 2bb2163bb1e69f59e9f36a9413079ead42fa1d2c
  F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 -F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
 +F src/ctime.c 500d019da966631ad957c37705642be87524463b
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
  F src/delete.c 4c20ea4f6213b3bc1c6a510586864b679946e05e
- F src/expr.c eefabaa4a3dc67309a754eb0eab1a163ff4c2bf3
+ F src/expr.c 06a7733d19dc725dc46ba51afd9feadb4b85d991
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
  F src/func.c c6b3c94320253a35bda43fb69cc292618e3285d6
@@@ -140,8 -140,8 +140,8 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
 -F src/main.c 91458c713e9b7f8dbc98d79e78f1150f0ca9c2a1
 +F src/main.c 57b7ebf64804621a3d783a359d8a4c6a4d256573
- F src/malloc.c 15afac5e59b6584efe072e9933aefb4230e74f97
+ F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c b3677415e69603d6a0e7c5410a1b3731d55beda1
  F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
@@@ -171,13 -171,13 +171,13 @@@ F src/pragma.c 149d8400ff783741d4138917
  F src/prepare.c 9a00a9612ebf80203fbb41f8a29ab8cb27a05f40
  F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 748e75299faff345f34f0e5bd02a2bac8aa69fcd
+ F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
- F src/select.c d7b9018b7dd2e821183d69477ab55c39b8272335
- F src/shell.c 04399b2f9942bd02ed5ffee3b84bcdb39c52a1e6
+ F src/select.c f6c4833c4d8e94714761d99013d74f381e084f1d
+ F src/shell.c c16f72e34f611f060546709564c121a67cb2b31b
 -F src/sqlite.h.in 4f4d4792f6fb00387c877af013cb09d955643f12
 +F src/sqlite.h.in 51b406bc156dcdfbb2af45ba11555256f23937be
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h c5e917c4f1453f3972b1fd0c81105dfe4f09cc32
+ F src/sqliteInt.h 97ccae71ae0a4e924dcb9fab14eb4fc4839790da
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -997,7 -998,10 +998,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 12bb31dd6f0d8544406710d6f02f0b7c0fe6c537 736d6ea677f58e4aa2914fa79a3156b775c5a3f5
- R fe82a7de8d73461a6ba87765ea326828
- U mistachkin
- Z 229fa5a08bef71b3184983513b25255b
 -P 5519cc5ef471e32a59995a34be811b46478dca1e
 -R f9f0e59804fa7e60869ace7ace22bd3d
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.7.12.1 *
++P 224c65e4a5c6ede076c364c93933cedd17f1e70b 6d326d44fd1d626aae0e8456e5fa2049f1ce0789
++R 4f25f9545051a609810b52e6c59078d1
+ U drh
 -Z a30e57621f706278c1c64a3624297cbb
++Z b60ecf5beb2c5144541d29fa3c1ce0f9
diff --cc manifest.uuid
index 2db95ff858,ff54f427e8..5b151b6f2f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 224c65e4a5c6ede076c364c93933cedd17f1e70b
 -6d326d44fd1d626aae0e8456e5fa2049f1ce0789
++b9ed0b26debd225a4530eb17d25b857e8e883a85