Merge all the latest trunk changes into the sessions branch.

FossilOrigin-Name: fc07a4795e027108674d1d41eb4350df629ddc8b

diff --cc Makefile.msc
Simple merge

diff --cc configure
index cf50e609ea85aa419e35b24891f1067ab1a97128,af10fe3bd18b694ab483efdf3f4da0d3a4a87df6..fce5e4ff0471f192643374e3ed5d6eab184a8124
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -14518,7 -14520,7 +14520,8 @@@ $debug |
  if test -n "$CONFIG_FILES"; then
  
  
--ac_cr='\r'
++ac_cr='
++'
  ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
  if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
    ac_cs_awk_cr='\\r'
@@@ -15753,4 -15755,4 +15756,3 @@@ if test -n "$ac_unrecognized_opts" && t
    { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
  $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
--

diff --cc main.mk
Simple merge

diff --cc manifest
index 050ff5abc2580672cfb793e8e3f90b4c2fcf6e74,7248b97071d1cad319a6f55dbebc91ee14354ff1..9d3769cfebb6f67a501e233de598de325b61ac45
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\slatest\strunk\schanges\swith\ssessions\sbranch.
- D 2012-06-09T19:15:43.423
 -C Change\sautoconf\sso\sthat\sthe\s--with-tcl=DIR\soption\swill\soverride\sthe\nTCL\sconfiguration\sthat\sis\sfound\susing\stclsh.
 -D 2012-08-15T16:06:54.475
++C Merge\sall\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2012-08-15T16:21:55.837
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in d17fddaa4e81f93a7c9c7c0808aacb3fc95f79f4
+ F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc f4c1ecc6adf3e81857ccae612247db401df63e4c
- F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
 -F Makefile.msc c1293ece66e237b545eae4484e3e81571fb5f47c
++F Makefile.msc 49411436c99bf768dcd1cc749a52d7b071803e05
+ F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION 3e857b9b826e818eec9411eafe2c3fa22c1dbb8a
+ F VERSION a71848df48082f1d6585d4b0819d530fc455485d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -15,8 -15,8 +15,8 @@@ F art/sqlite370.jpg d512473dae7e378a67e
  F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
  F config.h.in 0921066a13130082764ab4ab6456f7b5bebe56de
  F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
- F configure 79405675c313ce4a5e94afac6ec880bb3e27b4f1 x
- F configure.ac 9ee886c21c095b3272137b1553ae416c8b8c8557
 -F configure e2d0e3b67d2b1b1049d389fd671275d79bb80457 x
++F configure 4dd7d5fa033f649d7372e9ebd4aff68db6026da4 x
+ F configure.ac 6e909664785b8184db2179013cd9d574f96ca3a3
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/lemon.html 3091574143dd3415669b6745843ff8d011d33549
  F doc/pager-invariants.txt 870107036470d7c419e93768676fae2f8749cf9e
@@@ -101,21 -101,9 +101,21 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82
  F ext/rtree/sqlite3rtree.h c34c1e41d1ab80bb8ad09aae402c9c956871a765
  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 d1663c1ef1e9352b86138f40363f172f7a7f7728
 -F main.mk 72026405046ed5b1f0368943b89c0aa29ad558b6
++F main.mk 1e1c4a0f975cc43e3e4221249367a40c076b34c0
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
  F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@@ -143,21 -131,21 +143,21 @@@ F src/callback.c 0cb4228cdcd827dcc5def9
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  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/expr.c e2927abf9c69ce4ff9a931bd201946961c34819a
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
- F src/func.c c6b3c94320253a35bda43fb69cc292618e3285d6
+ F src/func.c 18dfedfb857e100b05755a1b12e88b389f957879
  F src/global.c 4cfdca5cb0edd33c4d021baec4ede958cb2c793b
- F src/hash.c 458488dcc159c301b8e7686280ab209f1fb915af
+ F src/hash.c a4031441741932da9e7a65bee2b36b5d0e81c073
  F src/hash.h 2894c932d84d9f892d4b4023a75e501f83050970
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c e32d8d0b761ae5e57d804948bb4e01029a9653b0
 -F src/insert.c 770ed633830fb49d73d90c3fdf20b703973e1e84
++F src/insert.c 49dd0445a92aece7dea9f9b3018e479892b77a68
  F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
  F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
  F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
  F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
- F src/main.c 629ec4720d85c3908a896f15002e65cae7405caa
 -F src/main.c 02255cf1da50956c5427c469abddb15bccc4ba09
++F src/main.c 1f15146d32b183d45fd0d41e8370a326c5d647ac
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c b3677415e69603d6a0e7c5410a1b3731d55beda1
@@@ -190,11 -176,11 +188,11 @@@ F src/printf.c 4a9f882f1c1787a8b494a298
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd
  F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
- F src/select.c f6c4833c4d8e94714761d99013d74f381e084f1d
- F src/shell.c c16f72e34f611f060546709564c121a67cb2b31b
- F src/sqlite.h.in 40b1e84aa065bcc05d583c74036bc2dd836db36d
+ F src/select.c a365da6d7a6d7d8a10ad60ca71837ab5e9369466
+ F src/shell.c 076e1c90d594644f36027c8ecff9a392cf2d3a06
 -F src/sqlite.h.in 3e8035bc406b1571a5cc8ea46bcc831201676f1a
++F src/sqlite.h.in f0bc4a3e082cda4e52ce74e96dc47043ec3c3e9b
  F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
- F src/sqliteInt.h 5b446b260eb774eb663ea0fe8dab10e056a9a859
 -F src/sqliteInt.h c8169801f8bbfdf5873cc6fa45cb5df720c04db4
++F src/sqliteInt.h 23284c2be677c1fb3c14051cd67427077825e8ee
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -212,10 -198,10 +210,10 @@@ 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 f87165e4c5eb066fe9c930e634dfe65199f1bfc5
 -F src/test_config.c 9b37587750f247186ebeb02a02e8f17c611d1866
++F src/test_config.c aa0f42add3ea63920a8b7d1869be4c9b4106bdaa
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
- F src/test_func.c 090f2c3339e85c2c964435f99aed6f3da9d59525
+ F src/test_func.c 3a8dd37c08ab43b76d38eea2836e34a3897bf170
  F src/test_fuzzer.c 1d26aa965120420bc14807da29d4d4541bfa6148
  F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
  F src/test_init.c 3cbad7ce525aec925f8fda2192d576d47f0d478a
@@@ -247,21 -233,21 +245,21 @@@ 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/util.c 0af2e515dc0dabacec931bca39525f6c3f1c5455
  F src/vacuum.c 587a52bb8833d7ac15af8916f25437e2575028bd
- F src/vdbe.c 687fdb8636a4ca286febe4e4e4f19b6f681b445a
 -F src/vdbe.c 75da79cdcd58481825a06f045bc2f5ea3966eeae
 -F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 -F src/vdbeInt.h 986b6b11a13c517337355009e5438703ba5b0a40
 -F src/vdbeapi.c 88ea823bbcb4320f5a6607f39cd7c2d3cc4c26b1
 -F src/vdbeaux.c dce80038c3c41f2680e5ab4dd0f7e0d8b7ff9071
 -F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
++F src/vdbe.c 9a1c2f78ae8baba248c0369a2f7717a288c22205
 +F src/vdbe.h 87b8ff40de3f55dbcdc33029416862f517c37a2f
- F src/vdbeInt.h f1956902b06b4f05ce965aafab6fe220a5477f9c
- F src/vdbeapi.c 2fc381f651738feb2495cb001cf2114dea596cc3
- F src/vdbeaux.c dcff925ee54f73a6a729ea56e4197c91b38645c4
++F src/vdbeInt.h 3f5d994703b6d61032d48f3086329c960b1697e9
++F src/vdbeapi.c 7d23764ea26c1fff2959e6a0984dd96de0fa8f75
++F src/vdbeaux.c 91923b781aa3db404fea7c7567617bf61a9a32d0
 +F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381
  F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
- F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
- F src/vdbetrace.c 79059ebd17b3c8545fab2a24253713e77e4ab392
+ F src/vdbesort.c 0dc1b274dcb4d4c8e71b0b2b15261f286caba39b
+ F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835
  F src/vtab.c bb8ea3a26608bb1357538a5d2fc72beba6638998
- F src/wal.c 7bb3ad807afc7973406c805d5157ec7a2f65e146
+ F src/wal.c 9294df6f96aae5909ae1a9b733fd1e1b4736978b
  F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
  F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
  F src/where.c 24c7494d8875ead994b4dfe5461340c27fd424ca
@@@ -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 c67d4f41daa30aeb157eb45d991eb3fc271a7096
- F test/pragma.test cb736bcc75b8b629af21ac0ad83ba1d054a2107b
 -F test/permutations.test d12fabf8abdb71b79eb6c3ef3be5e875fe790071
++F test/permutations.test b4f49af522304134d32966ccef8b00d2c4765664
+ F test/pragma.test a62f73293b0f0d79b0c87f8dd32d46fe53b0bd17
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
@@@ -1018,7 -1009,8 +1022,8 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P c62140398344fd1a68a3e6dfe8b4fab280731ebb 0ae0ce630a2e11f81dca50a9cfb04c4a41c03b2d
- R 3d7646a2017b0e596385909c0de9563e
- U dan
- Z 770dd5c1bc35db7eb59646895dc3fb87
+ F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
 -P a5431c86df442c6e6dfaeae8e8aa62b56d204e97
 -R 6123b9c9d97ee6d2b788aa279b8a3858
++P 47f8f0711d63ef4166db9115db44b166959df14c 772d0de3f311f2035f8a42f01371c96c9fa587ce
++R e864d66a36e838c2faa41d39d7a05218
+ U drh
 -Z 4d101c802bb37b58a1c59c63393cf7ab
++Z abda2788c852df70f4e42cf73ff52089

diff --cc manifest.uuid
index 9987079235d4f8ed797d3fcf0db306ea84298336,1bfbcb6c1394fb4331a21a17b28ab628116324d8..ce7f8cd3c065155afb733456d99457525d724698
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 47f8f0711d63ef4166db9115db44b166959df14c
 -772d0de3f311f2035f8a42f01371c96c9fa587ce
++fc07a4795e027108674d1d41eb4350df629ddc8b

diff --cc src/insert.c
Simple merge

diff --cc src/main.c
Simple merge

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

diff --cc src/sqliteInt.h
index 50facb0d3dfc206a4ba9f6785facbc7153428b83,b3cdb2363c6e1f5e0ce54e313c53a1f856d12475..17ec0b0b942a3a25a152e77bf3c790251921c9e3
--- 1/src/sqliteInt.h
--- 2/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@@ -2316,9 -2315,10 +2326,11 @@@ struct AuthContext 
  #define OPFLAG_APPEND        0x08    /* This is likely to be an append */
  #define OPFLAG_USESEEKRESULT 0x10    /* Try to avoid a seek in BtreeInsert() */
  #define OPFLAG_CLEARCACHE    0x20    /* Clear pseudo-table cache in OP_Column */
 +#define OPFLAG_ISNOOP        0x40    /* OP_Delete does pre-update-hook only */
  #define OPFLAG_LENGTHARG     0x40    /* OP_Column only used for length() */
  #define OPFLAG_TYPEOFARG     0x80    /* OP_Column only used for typeof() */
+ #define OPFLAG_BULKCSR       0x01    /* OP_Open** used to open bulk cursor */
+ #define OPFLAG_P2ISREG       0x02    /* P2 to OP_Open** is a register number */
  
  /*
   * Each trigger present in the database schema is stored as an instance of

diff --cc src/test_config.c
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeapi.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/permutations.test
Simple merge