From: drh <drh@noemail.net>
Date: Thu, 19 Apr 2012 20:00:31 +0000 (+0000)
Subject: Merge the latest trunk changes into the sessions branch.
X-Git-Tag: version-3.13.0~148^2~240
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=efa50bdac11c256a1bbb69b5e9cb38e5b815a443;p=thirdparty%2Fsqlite.git

Merge the latest trunk changes into the sessions branch.

FossilOrigin-Name: 2b7a91e61794ce9ffe210bad584454e52c79924e
---

efa50bdac11c256a1bbb69b5e9cb38e5b815a443
diff --cc manifest
index 0553e9c7a4,1c11ae957b..e54c95b9a5
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Import\sall\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2012-04-18T01:41:37.755
 -C Fix\sharmless\scompiler\swarnings\son\sx64\sMSVC,\smostly\sin\stest\scode,\sbut\salso\sin\ntclsqlite.c\sand\sin\sthe\sFTS4\smodule.
 -D 2012-04-19T18:04:28.392
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2012-04-19T20:00:31.443
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -146,8 -134,8 +146,8 @@@ F src/callback.c 0cb4228cdcd827dcc5def9
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 -F src/delete.c 4c20ea4f6213b3bc1c6a510586864b679946e05e
 +F src/delete.c 32041c65dc05a94914cf979fad7b82bc8a963fe9
- F src/expr.c 1b2383adc4391ddae38abb71fd4690a3af8efb01
+ F src/expr.c eefabaa4a3dc67309a754eb0eab1a163ff4c2bf3
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
  F src/func.c c6b3c94320253a35bda43fb69cc292618e3285d6
@@@ -201,26 -189,26 +201,26 @@@ F src/sqliteInt.h 572c5e6aca50256bdbc34
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 6246dd3e1a8f38bbcb6f9bd59d4800e786f21176
- F src/test1.c 8631f728c9c3afcf79e3e22b510e451435e3d15e
- F src/test2.c 711555927f1f7e8db9aab86b512bc6934a774abe
- F src/test3.c f82399ec50d9cd7378bf9d6db6c1409d5e77b042
 -F src/tclsqlite.c fe5406573e1527957e00dcaf51edd9d8bd31b918
++F src/tclsqlite.c e4feb5698ee09f8b32ee40baa1d3577871125042
+ F src/test1.c a808bfa548a501b513579bdbaf83901c98e059c9
+ F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
+ F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
  F src/test5.c a6d1ac55ac054d0b2b8f37b5e655b6c92645a013
- F src/test6.c 3329df2dbc0293031d763947ec08c9eef982ef1d
+ F src/test6.c 417e1e214734393c24a8ee80b41485a9c4169123
  F src/test7.c 2e0781754905c8adc3268d8f0967e7633af58843
- F src/test8.c 61b41d79509a479dec1ac32b6d4209b27c4b1ba5
+ F src/test8.c 5ecbffe6712da81d5d10454e9d77d6c5bac95fe8
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
  F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
  F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
 -F src/test_config.c 0de329e736eb4aa5845069bed630e5c72f012264
 +F src/test_config.c 52aa8cab6e20e9de078a0fb4a6f45a0466fbae2a
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
- F src/test_func.c 6232d722a4ddb193035aa13a03796bf57d6c12fd
- F src/test_fuzzer.c 7e431cb04f4457b676a2764839d2857fdd91ec4e
- F src/test_hexio.c c4773049603151704a6ab25ac5e936b5109caf5a
+ F src/test_func.c 090f2c3339e85c2c964435f99aed6f3da9d59525
+ F src/test_fuzzer.c 1d26aa965120420bc14807da29d4d4541bfa6148
+ F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
  F src/test_init.c 3cbad7ce525aec925f8fda2192d576d47f0d478a
  F src/test_intarray.c d879bbf8e4ce085ab966d1f3c896a7c8b4f5fc99
  F src/test_intarray.h 489edb9068bb926583445cb02589344961054207
@@@ -1013,7 -1000,7 +1013,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P fb9b9987de965e194fef56bca563ee65c49f0950 430bb59d798286a86c351de92c429345f016b3f0
- R 1079dce486da15e32db2d612434f8ab1
 -P de3f7187eb2ff24683a1854ae523e7d30c290893
 -R 93ef8dac16d8fdeed30c697eb50ecf5c
++P 87a0eab5d98fff93aa2147c04c4af27be42fb365 3281972eaa46cb57fd9f0387063f47430dc0a3b4
++R 9636c18c52011b532bece9e648b40abc
  U drh
- Z f39a0ebbcb374338bf5b614e6c1f4af3
 -Z 1cd21a56051e90b0bfc0e250c8d84f38
++Z 8c2c5ae91a3dd05ffa0247cd525ea466
diff --cc manifest.uuid
index ec8bba7e8a,50f325473a..7bfab0804f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 87a0eab5d98fff93aa2147c04c4af27be42fb365
 -3281972eaa46cb57fd9f0387063f47430dc0a3b4
++2b7a91e61794ce9ffe210bad584454e52c79924e