Merge the latest trunk changes into the sessions branch.

FossilOrigin-Name: 2277c70b6f14e2f8043112a5c49a8bc18b7504f3

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index 6b587a1394d0a7e2b02a30d6843a739b34d72b0f,179517c1c11b63ab7abcbfe192a94eb5fcb8e26d..d9fb7598832ed8ac643cecc5b9085e28772f8857
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\sin\sthe\slatest\strunk\schanges.
- D 2012-03-05T16:26:00.280
 -C Ensure\sthat\scompatible\smalloc\sand\sfree\sfunctions\sare\sused\swith\sstat3\sdata\sif\sSQLITE_ENABLE_STAT3\sis\sdefined.
 -D 2012-03-19T10:21:37.927
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2012-03-19T11:17:17.067
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
+ F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc ceec8f4ac0f7f463f5ec241dc0115de7a84daba2
- F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
 -F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
++F Makefile.msc efc373edae0f99cb3b04672ccefea8162664d40b
+ F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION bb4c2a86abe53ea3c1d6ea515b69a426040e2414
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -103,21 -103,9 +103,21 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
  F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
  F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 +F ext/session/session1.test 502086908e4144dfaccb1baa77bc29d75a9daace
 +F ext/session/session2.test 99ca0da7ddb617d42bafd83adccf99f18ae0384b
 +F ext/session/session3.test a7a9ce59b8d1e49e2cc23d81421ac485be0eea01
 +F ext/session/session4.test a6ed685da7a5293c5d6f99855bcf41dbc352ca84
 +F ext/session/session5.test 8fdfaf9dba28a2f1c6b89b06168bdab1fef2d478
 +F ext/session/session6.test 443789bc2fca12e4f7075cf692c60b8a2bea1a26
 +F ext/session/session8.test 7d35947ad329b8966f095d34f9617a9eff52dc65
 +F ext/session/session_common.tcl 1539d8973b2aea0025c133eb0cc4c89fcef541a5
 +F ext/session/sessionfault.test 891453e96630ee2915081487fc4b7226f0aa252f
 +F ext/session/sqlite3session.c 57d04e1d6a3579e673e61dea29f214fb4e0fc505
 +F ext/session/sqlite3session.h f374c9c4c96e08f67ac418871c29d423245c7673
 +F ext/session/test_session.c ea4dc9b4a1895c8e6bddcbfe3838d7eb57df2d99
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk 0f09cc961194da519af6bdd3004bb3ec9ebddc80
 -F main.mk a80771d44176a0c744d9d4e048497e7ed0b4040d
++F main.mk a7a6511a621e89c25b59deb9614cf83611d724e1
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -159,7 -147,7 +159,7 @@@ F src/journal.c 552839e54d1bf76fb8f7abe
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c 18ef52feda1f9e151d1dcd032d0c7b95275a7397
 -F src/main.c 91458c713e9b7f8dbc98d79e78f1150f0ca9c2a1
++F src/main.c acab639c93295650b9ef056689e8092cfcf49f2a
  F src/malloc.c 15afac5e59b6584efe072e9933aefb4230e74f97
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c b3677415e69603d6a0e7c5410a1b3731d55beda1
@@@ -194,14 -182,14 +194,14 @@@ F src/resolve.c 3d3e80a98f203ac6b9329e9
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c 44ccdcb5d2a1c48622c179b2d72167b716388581
  F src/shell.c aa28f117033ba3e44b5eaaf2ad572222bcdfd66e
- F src/sqlite.h.in fc8237a04a17cb31addc670bc9abc99c6712d6d8
 -F src/sqlite.h.in 6af2d92925bfed3dfd2c022fef48469762ccd435
++F src/sqlite.h.in 7708d60987705890c8f7bb638202a69befcc1bf5
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 3242e4adac818351aed6306a679df3390c771c8b
 -F src/sqliteInt.h e65429a6f19b41720561b9434b2192574a91cfa2
++F src/sqliteInt.h f94543c697d5af8e48f9132be52723d021e10101
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 4568e72dfd36b6a5911f93457364deb072e0b03a
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c 2aeb69958965dad0842d5ea1456f1a958ef296e6
 +F src/tclsqlite.c 47d088f383a106b2914ac970586fdab66c1bd169
- F src/test1.c 328cbe4a4ee6d10d67ece2a7adaa2770569fae0f
+ F src/test1.c 07f30e8714bab94d8de8a88865d9c59bc512a1a8
  F src/test2.c 711555927f1f7e8db9aab86b512bc6934a774abe
  F src/test3.c 91d3f1a09cfae3533ef17d8b484a160f3d1f1a21
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -647,8 -635,8 +647,8 @@@ F test/pageropt.test 9191867ed19a2b3db6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
 -F test/permutations.test 2b5a1b64a8e5114757457fbce9010387d1fe7682
 +F test/permutations.test 24f0e5141b6aea74d023ac1d688c78df845d02dc
- F test/pragma.test f11c59ec935a52edb4d3d5676d456588121fcefa
+ F test/pragma.test c51c148defe32bf4a419a522f95d26838d5cf677
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -732,7 -719,7 +732,7 @@@ F test/tclsqlite.test 2f2aa887763af3064
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
  F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
- F test/tester.tcl 58281fb65095d5cacb9b70f40d72bba9ff3fad34
 -F test/tester.tcl 7db9e90e4a9cc57ea92118ee011634f86dc8e847
++F test/tester.tcl a3e41436033f39f7009de8bc4cb0de09d63f500a
  F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1005,7 -992,7 +1005,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 361fb66a799f4f253e61ca94d999accde2c75b2c 99a9073b5e411ce94f38ce49608baaa15de8b850
- R 73eef84d2253d0c1c19d15becb5073fc
- U drh
- Z 84b512c9c826efc22484fef61936c099
 -P 4f5283f18f570a09b95c26e5aa14885ada518dd2
 -R 86b82af92d1239c76d6157fdd039db02
++P ff86875ca35e04cea6c3d5e1b5117a4f227a6b15 32bb1ecee4e43a4683512dbca047abf735afd313
++R 948a6e5b4554cc0073571b0bc86d24bd
+ U dan
 -Z fc0fdf7e77db24e47eb9fd009ed1d240
++Z e481b29f0a9859d30dda533d61d9b2c9

diff --cc manifest.uuid
index dbe8f15c1f1479cf80b2d6b73ed1fac15cb240de,41bdf79e8d8d21cea8e474e96abc2012d1977a80..456b503bb712636d0946570b3fb984b3a438a7d2
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ff86875ca35e04cea6c3d5e1b5117a4f227a6b15
 -32bb1ecee4e43a4683512dbca047abf735afd313
++2277c70b6f14e2f8043112a5c49a8bc18b7504f3

diff --cc src/main.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc test/tester.tcl
Simple merge