Merge the latest trunk changes into the sessions branch.

FossilOrigin-Name: 110cfd6920cf3011aeaf7e586f8db867bfc69fbb

diff --cc main.mk
Simple merge

diff --cc manifest
index a3d6a2cab4337a8b2863930fe94c88842f863b67,42fc3e12f1ca94d811b72af368a194d0cf8ddfa8..4e10bb59472bcafce14cb12a288649de46f8e8e2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Fix\sthe\ssqlite3session_isempty()\smethod\sso\sthat\sit\sreturns,\sas\sdocumented,\snon-zero\swhen\sno\schanges\shave\sbeen\srecorded\sby\sthe\ssession\sobject.
- D 2011-07-18T15:22:56.414
 -C Also\sadd\sthe\ssqlite3-all.c\starget\sto\sthe\sMSVC\smakefile.
 -D 2011-07-22T11:23:49.199
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2011-07-22T12:49:27.667
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
+ F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 11082f65b452b908d93013292c17850378c39284
+ F Makefile.msc 8e04f517922b9e31a5bf975f07bb66df79ae7076
  F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION 3fcdd7fbe3eb282df3978fe77288544543767961
+ F VERSION f724de7326e87b7f3b0a55f16ef4b4d993680d54
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/2005osaward.gif 0d1851b2a7c1c9d0ccce545f3e14bca42d7fd248
@@@ -102,20 -102,9 +102,20 @@@ 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 98691eec553390d61114b6214d2397f399dc1198
 +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/session_common.tcl 1539d8973b2aea0025c133eb0cc4c89fcef541a5
 +F ext/session/sessionfault.test 401045278298a242cbc2e4bc986c102f01ff2180
 +F ext/session/sqlite3session.c 97295e187eade25398f52ed8b13fea68e0ee1e02
 +F ext/session/sqlite3session.h 8dec372049532017d71c992609ca5450de7c5520
 +F ext/session/test_session.c ea4dc9b4a1895c8e6bddcbfe3838d7eb57df2d99
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
- F main.mk f56d9895882f5cdd9f9f9ba8f8a679e9202288c1
 -F main.mk 50adb7368bd0faa888eb4634b874d542d44f3de3
++F main.mk 47bb833f273c17812370a750b1a697cd14580b75
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -142,11 -131,11 +142,11 @@@ F src/build.c 5e614e586d9f8a81c16c80b54
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 7deec4534f3b5a0c3b4a4cbadf809d321f64f9c4
- F src/date.c d3c11de76392ea62637bfac0f4655889fc2f5a85
- F src/delete.c 7a8683a38e86d48a0e67ef949fddac6daf46d89d
- F src/expr.c ab46ab0f0c44979a8164ca31728d7d10ae5e8106
+ F src/date.c a3c6842bad7ae632281811de112a8ba63ff08ab3
 -F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
++F src/delete.c 614d6e012aa5b624e78f3b556243497825de196b
+ F src/expr.c 4bbdfaf66bc614be9254ce0c26a17429067a3e07
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 9fabba17a4d4778dc660f0cb9d781fc86d7b9d41
+ F src/fkey.c c8492fed772af1ed61251582707266227612b45b
  F src/func.c 59bb046d7e3df1ab512ac339ccb0a6f996a17cb7
  F src/global.c c70a46f28680f8d7c097dbc0430ccf3b932e90b0
  F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
@@@ -156,8 -145,8 +156,8 @@@ F src/insert.c 1f1688a9da8b8e27114ba190
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
- F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85
+ F src/loadext.c 99a161b27a499fc8ad40745b7b1900a26f0a5f51
 -F src/main.c fa654e1802e14a5f6c09c37971c3b69c1001d9c8
 +F src/main.c 8a386605c22e4b2becfe96bab2ac7128b480d489
  F src/malloc.c 591aedb20ae40813f1045f2ef253438a334775d9
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
@@@ -188,18 -177,18 +188,18 @@@ F src/pragma.c ebcd20f1e654f5cb3aeef864
  F src/prepare.c e64261559a3187698a3e7e6c8b001a4f4f98dab4
  F src/printf.c 585a36b6a963df832cfb69505afa3a34ed5ef8a1
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
+ F src/resolve.c 36368f44569208fa074e61f4dd0b6c4fb60ca2b4
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
- F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
- F src/shell.c 0e0173b3e79d956368013e759f084caa7995ecb1
- F src/sqlite.h.in f292d325b466081f8980911316743192cce6832a
- F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h 3c2f3f13d8ea942ddfee1df1b78013566eae8a74
+ F src/select.c d219c4b68d603cc734b6f9b1e2780fee12a1fa0d
+ F src/shell.c bbe7818ff5bc8614105ceb81ad67b8bdc0b671dd
 -F src/sqlite.h.in badc4f56b9b57a8731475c2ddbccd8198ce33b9b
++F src/sqlite.h.in 4cd98228ea9cbb0359aaf725fdbebcd37c082c6a
+ F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
 -F src/sqliteInt.h ba4a6d6288efb25b84bc0d7d0aaf80f9b42523ba
++F src/sqliteInt.h 113559f0c2202c4e648b5d647d7b2409604fb516
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 6a34149c9ff4a6f998a4cb8336d4481670b576b6
- F src/test1.c 8eef932f1024f1076a8adb8a6f5d9c5267c9e969
 -F src/tclsqlite.c c355b33803fb756dc09297ec84d19604301fa622
++F src/tclsqlite.c e85bada4bf1796274a2cd7b3db9a663f8df31880
+ F src/test1.c 693d9a63dfe2c68b167080c99cab82f267f5a38e
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -212,7 -201,7 +212,7 @@@ F src/test_async.c 0612a752896fad42d55c
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
  F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
  F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
- F src/test_config.c 470765ec36636d2c598766342b58e4c841e24512
 -F src/test_config.c b4648b103586d2ae863056080c657680f6fa4825
++F src/test_config.c 70c74ef7a696c1b40d6415d48ee4c8f668cd16a8
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
@@@ -244,17 -233,17 +244,17 @@@ F src/test_vfstrace.c 0b884e06094a746da
  F src/test_wholenumber.c 6129adfbe7c7444f2e60cc785927f3aa74e12290
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c c819d9f72168a035d545a5bdafe9b085b20df705
- F src/trigger.c c836a6caac16ba96611558922106858f6ca3d6bf
- F src/update.c a81bda229f8c3b698f8dcf8e69485c97e1347102
+ F src/trigger.c 1cfb80e2290ef66ea89cb4e821caae65a02c0d56
 -F src/update.c 74a6cfb34e9732c1e2a86278b229913b4b51eeec
++F src/update.c 2d67e24d5a44d8b1c0839bf2ee0c391593e852bf
  F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0
- F src/util.c 0f33bbbdfcc4a2d8cf20c3b2a16ffc3b57c58a70
+ F src/util.c 06302ffd2b80408d4f6c7af71f7090e0cf8d8ff7
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c df52db6162fd94767b76bb4e9a7cb9207e83086f
 -F src/vdbe.c a9ced64f380bbd8b04da3a1c3a9602d3942704b5
 -F src/vdbe.h 5cf09e7ee8a3f7d93bc51f196a96550786afe7a1
 -F src/vdbeInt.h ad84226cc0adcb1185c22b70696b235a1678bb45
 -F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
 -F src/vdbeaux.c 4d100407e3c72e163854aff8903d19d5ecdf46c0
 -F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
++F src/vdbe.c 00061273468d03c6c5c0f6144ed219c0004cf849
 +F src/vdbe.h 322af148cceef120bb1ec9cff7f122e76abf94da
 +F src/vdbeInt.h 3de6588b36c833969aebab202e1766d586c37ec2
- F src/vdbeapi.c 432a8a194accb9fe9fae45338f210174c6c961b4
- F src/vdbeaux.c bb86d48ce99c288d17e8d79711713399c21f0a8d
++F src/vdbeapi.c ddd061183e2c3015f676e53ee85fcaf306617e8e
++F src/vdbeaux.c 7d0b75a04ac466d25a90fefd1df83361a2ab0ad7
 +F src/vdbeblob.c a547f286b651641bdb43a567af66d0e776a39ea2
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
  F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
@@@ -502,8 -492,8 +503,8 @@@ F test/fuzz2.test 207d0f9d06db3eaf47a6b
  F test/fuzz3.test aec64345184d1662bd30e6a17851ff659d596dc5
  F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
  F test/fuzz_malloc.test dd7001ac86d09c154a7dff064f4739c60e2b312c
- F test/fuzzer1.test 3105b5a89a6cb0d475f0877debec942fe4143462
+ F test/fuzzer1.test ddfb04f3bd5cfdda3b1aa15b78d3ad055c9cc50f
 -F test/hook.test f2277c309e4ee8067d95d6b9b315568e9d5329b2
 +F test/hook.test 4fd80e9c3ffb49de0379e2a026ef2fe7b9f3e534
  F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
  F test/in.test 19b642bb134308980a92249750ea4ce3f6c75c2d
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
@@@ -626,7 -616,7 +627,7 @@@ F test/pageropt.test 8146bf448cf09e87bb
  F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
  F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
  F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
- F test/permutations.test 8331b2897502df0671dd1390a3c87db44fb8757c
 -F test/permutations.test aae89941ca0968b53633c97b5dd0d6f9f9899d27
++F test/permutations.test df39e810d98a966218ef1391afb4e25491af698f
  F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
  F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
  F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
@@@ -666,10 -656,9 +667,10 @@@ F test/select7.test dad6f00f0d49728a879
  F test/select8.test 391de11bdd52339c30580dabbbbe97e3e9a3c79d
  F test/select9.test 74c0fb2c6eecb0219cbed0cbe3df136f8fbf9343
  F test/selectA.test 06d1032fa9009314c95394f2ca2e60d9f7ae8532
- F test/selectB.test f305cc6660804cb239aab4e2f26b0e288b59958b
+ F test/selectB.test 0d072c5846071b569766e6cd7f923f646a8b2bfa
  F test/selectC.test f9bf1bc4581b5b8158caa6e4e4f682acb379fb25
  F test/server1.test f5b790d4c0498179151ca8a7715a65a7802c859c
 +F test/session.test c1a17c11ef7d01c24fe2b9f7871190d949a8e718
  F test/shared.test b9114eaea7e748a3a4c8ff7b9ca806c8f95cef3e
  F test/shared2.test 7f6ad2d857d0f4e5d6a0b9a897b5e56a6b6ea18c
  F test/shared3.test d69bdd5f156580876c5345652d21dc2092e85962
@@@ -703,11 -692,11 +704,11 @@@ F test/syscall.test 707c95e4ab7863e13f1
  F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
  F test/table.test 04ba066432430657712d167ebf28080fe878d305
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
 -F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
 +F test/tclsqlite.test 1ce9b6340d6d412420634e129a2e3722c651056a
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
- F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
+ F test/temptable.test 1a21a597055dcf6002b6f1ee867632dccd6e925c
  F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
 -F test/tester.tcl aad52c7644513e5650f6613d371b0af3193c3885
 +F test/tester.tcl 3b6143fdafff36c516cf0fd663a20cd420aae36f
  F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
  F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
  F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@@ -957,11 -948,11 +960,11 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
- F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
+ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
- P 70c84e50209722a61d66fd737e42d49275745b62
- R 7d529af0ae98dc5a31387a39a49b9017
- U dan
- Z 3511ba374807e0034b8197f50cf80466
+ F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
 -P 71f7be586f5a18493cd516f89c4ecc460bb24462
 -R 645e7d58a7503109e1bb3e986974849f
++P d04e0fd82a15aee963e35830caf8159b4b6ccd87 8ce2b74a82264550b0e19da3e0e1a145db940a1c
++R a5737ded89a8c66dbf565b51f6981ff8
+ U drh
 -Z aaeed83d2a39a45645a69e9a638df017
++Z 81f45685ad26c120405ad7cb74da4306

diff --cc manifest.uuid
index 7c4bfbd3cf3e3a680c66e38de7119c1c1003b9d6,e12fc9631153b9393b2bdc8d13fc662ef9db40a5..cd26a2668cca4da3016b0184bc48030802d2a149
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d04e0fd82a15aee963e35830caf8159b4b6ccd87
 -8ce2b74a82264550b0e19da3e0e1a145db940a1c
++110cfd6920cf3011aeaf7e586f8db867bfc69fbb

diff --cc src/delete.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/tclsqlite.c
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/update.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/permutations.test
Simple merge