Merge all trunk changes, including the WinRT enhancements, into the

sessions branch.

FossilOrigin-Name: c62140398344fd1a68a3e6dfe8b4fab280731ebb

diff --cc Makefile.msc
Simple merge

diff --cc manifest
index 847851c94a99372f2545ed9fbad738c5f231d28d,c259a51bfc37fcb2de4ef5705d7966da32ef3083..a6264f5fe2bb8750c8394f787fb1a75bf5c6509d
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\s64-to-32-bit\sRTree\srounding\sfixes\sfrom\strunk\sinto\sthe\ssessions\sbranch.
- D 2012-05-29T00:48:55.913
 -C Documentation\sand\sevidence\smark\supdates.\s\sRemove\sa\sredundant\sassert().
 -D 2012-06-07T17:57:23.952
++C Merge\sall\strunk\schanges,\sincluding\sthe\sWinRT\senhancements,\sinto\sthe\nsessions\sbranch.
++D 2012-06-07T23:58:36.424
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 4f37eb61be9d38643cdd839a74b8e3bad724cfcf
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc bcc41c5232d1355faa59e4bc96d1561f69b5192a
 -F Makefile.msc fd86027849a59a2f621b791b79eabf3f8ffbd684
++F Makefile.msc f4c1ecc6adf3e81857ccae612247db401df63e4c
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 3e857b9b826e818eec9411eafe2c3fa22c1dbb8a
@@@ -138,12 -126,12 +138,12 @@@ F src/btmutex.c 976f45a12e37293e32cae02
  F src/btree.c f0b71054103cb77eb5e782088c16998ec4f06624
  F src/btree.h 48a013f8964f12d944d90e4700df47b72dd6d923
  F src/btreeInt.h 38a639c0542c29fe8331a221c4aed0cb8686249e
- F src/build.c 2bb2163bb1e69f59e9f36a9413079ead42fa1d2c
+ F src/build.c 47c4506afe4bcb4ed1f4b5357582d1cb3402f8ad
  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/delete.c 32041c65dc05a94914cf979fad7b82bc8a963fe9
  F src/expr.c 06a7733d19dc725dc46ba51afd9feadb4b85d991
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
@@@ -157,7 -145,7 +157,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 bc2d30cc532dca475a2a4a18cb67e1b0ec389f43
 -F src/main.c 07e05ba330b5994fa20d3b2e8c1c146133587d68
++F src/main.c 629ec4720d85c3908a896f15002e65cae7405caa
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c b3677415e69603d6a0e7c5410a1b3731d55beda1
@@@ -192,14 -180,14 +192,14 @@@ F src/resolve.c b3c70ab28cac60de33684c9
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
  F src/select.c f6c4833c4d8e94714761d99013d74f381e084f1d
  F src/shell.c c16f72e34f611f060546709564c121a67cb2b31b
- F src/sqlite.h.in 45a846045ddb8c4318f2919f3a70f011df5ca783
 -F src/sqlite.h.in 39f041ce71a0d994e2487014fc9e8721595f5bc0
++F src/sqlite.h.in 40b1e84aa065bcc05d583c74036bc2dd836db36d
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h d13f48a1067fc637f86f77ee6b4ad9f98c7c10c6
 -F src/sqliteInt.h 29b5348f0056d9b46d0bb94d4853db21568afde9
++F src/sqliteInt.h 5b446b260eb774eb663ea0fe8dab10e056a9a859
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c fe5406573e1527957e00dcaf51edd9d8bd31b918
 +F src/tclsqlite.c e4feb5698ee09f8b32ee40baa1d3577871125042
- F src/test1.c a808bfa548a501b513579bdbaf83901c98e059c9
+ F src/test1.c fc2acf0a2db517c8d19e5e55bda8e1237db77378
  F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
  F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -212,7 -200,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 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
- F src/test_config.c 31ad0c013a7c1cfb3c12dc8cd33c7fbe92be0050
 -F src/test_config.c 4f7b8030287d62fe56a1d99e68b41760feae381a
++F src/test_config.c f87165e4c5eb066fe9c930e634dfe65199f1bfc5
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c 090f2c3339e85c2c964435f99aed6f3da9d59525
@@@ -247,16 -235,16 +247,16 @@@ F src/test_wholenumber.c 3d2b9ed1505c40
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
  F src/trigger.c ee7e178fb9188f44b532cebd449a7c1df90fb684
 -F src/update.c d3076782c887c10e882996550345da9c4c9f9dea
 +F src/update.c 89de085a0bf4da448472029d0420a2b1cf1824ee
  F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
  F src/util.c 4f6cfad661b2e3454b0cdd5b1b9d39a54942d0e3
- F src/vacuum.c bfd53f9bd20a8fdb70b0fa8e77182b866875c0d8
- F src/vdbe.c 15bcec4d80f6471daf6e03ec9d6d32f9f9df4cbf
+ F src/vacuum.c 587a52bb8833d7ac15af8916f25437e2575028bd
 -F src/vdbe.c f5ad3c06dc3fe647097065829c013f3f1b9eadca
 -F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 -F src/vdbeInt.h 6ff4180a05683566a8835d12f7ec504b22932c82
 -F src/vdbeapi.c 3662b6a468a2a4605a15dfab313baa6dff81ad91
 -F src/vdbeaux.c d52c8a424fdd4b1d5cf1ac93cc7cd20da023ec5c
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c 687fdb8636a4ca286febe4e4e4f19b6f681b445a
 +F src/vdbe.h 87b8ff40de3f55dbcdc33029416862f517c37a2f
 +F src/vdbeInt.h f1956902b06b4f05ce965aafab6fe220a5477f9c
 +F src/vdbeapi.c 2fc381f651738feb2495cb001cf2114dea596cc3
 +F src/vdbeaux.c dcff925ee54f73a6a729ea56e4197c91b38645c4
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
  F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
  F src/vdbetrace.c 79059ebd17b3c8545fab2a24253713e77e4ab392
@@@ -654,8 -642,8 +654,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 7f1f9e22593cf13d548d3cce7f7eddc72872ae2f
- F test/pragma.test c51c148defe32bf4a419a522f95d26838d5cf677
 -F test/permutations.test 2af90e00cea9e7e7c0a6b16d34727cb5bbae14dd
++F test/permutations.test c67d4f41daa30aeb157eb45d991eb3fc271a7096
+ F test/pragma.test cb736bcc75b8b629af21ac0ad83ba1d054a2107b
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -701,8 -689,7 +701,8 @@@ F test/selectA.test 06d1032fa9009314c95
  F test/selectB.test 954e4e49cf1f896d61794e440669e03a27ceea25
  F test/selectC.test 871fb55d884d3de5943c4057ebd22c2459e71977
  F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
- F test/shared.test 64fe647f17b2de0622437829a9e9823c20439fce
 +F test/session.test c1a17c11ef7d01c24fe2b9f7871190d949a8e718
+ F test/shared.test 1da9dbad400cee0d93f252ccf76e1ae007a63746
  F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
  F test/shared3.test ebf77f023f4bdaa8f74f65822b559e86ce5c6257
  F test/shared4.test 72d90821e8d2fc918a08f16d32880868d8ee8e9d
@@@ -746,7 -734,7 +747,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 f341da6a8982a5d1c521a45c9dd09260d728a147
 -F test/tester.tcl 2665f64c9ce71944b4d41269114e658fb81bda05
++F test/tester.tcl 184ef244e01486ba1625f71f501b07dd483f5a54
  F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1015,9 -1003,9 +1016,9 @@@ F tool/symbols-mingw.sh 4dbcea7e7476830
  F tool/symbols.sh fec58532668296d7c7dc48be9c87f75ccdb5814f
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
+ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P df817e70afc3f41e680d8f84dfa5772d5b3ae4d9 0abdc2903d8b3f86cad426e1bac2a959d1b1f7dd
- R f8bdf16e0b6379c99170e71117fa9c48
 -P 7caca1939ce70d5b14ae8ca8ff6afb62f8aff361
 -R 7d7d8055ffab93415bb0679c51b1e783
++P 7eff45c28058fd1cb06dfd7f253cf2e4866e8c7c cfcbf9375fddd0aae0dd17bdc76a710ab77ef667
++R dbfa0f0e08ebf8fec274eb616318eec9
  U drh
- Z a23d222ba42cdc5e20627a5287bd3b9c
 -Z 4e021c1abd989c10ef460664cb392a3f
++Z efdc5269554081bca5634d27aa5c834f

diff --cc manifest.uuid
index 999fb322d3b1d21838e30524acbbed049e5c51d1,04a75c4fc132e3d63b12c4744aea3a79992a5fa6..818ac5bca48e27f73774022712e703c635ce1fc8
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7eff45c28058fd1cb06dfd7f253cf2e4866e8c7c
 -cfcbf9375fddd0aae0dd17bdc76a710ab77ef667
++c62140398344fd1a68a3e6dfe8b4fab280731ebb

diff --cc src/main.c
Simple merge

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

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc test/permutations.test
Simple merge

diff --cc test/tester.tcl
Simple merge