Pull in all the latest changes from trunk.

FossilOrigin-Name: af3ca4c6e557e6bc92584586b5a97d9be41b0b82

diff --cc manifest
index 05a751b4818e2e5b5686ab1eb071eacfe1baca1d,048d682c0abb22ec832fe49b9fbbfcb20d81986e..66bca82b2dd92bf2ebe73d88b6125ef1b98af7ee
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Fix\sa\sbug\spreventing\ssome\sFK\sconstraint\schecking\sfrom\sbeing\sdeferred\suntil\sthe\send\sof\schangeset\sapplication.
- D 2013-07-04T15:22:53.953
 -C Modify\sseveral\sextensions\sto\suse\sthe\snew\sexported\sfunction\snaming.\s\nFix\ssome\sshared\slibrary\scompilation\sissues.
 -D 2013-07-09T12:36:30.399
++C Pull\sin\sall\sthe\slatest\schanges\sfrom\strunk.
++D 2013-07-09T13:05:49.248
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 +F Makefile.in aff38bc64c582dd147f18739532198372587b0f0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 7d226394826f060f232c0a02a468e8651819b7c2
 +F Makefile.msc ea294496193d9ed30137730b42ec2fc07ca5f544
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION f135b651727f978b7191bd6fa12c7fc1e13e13ac
@@@ -151,10 -139,10 +152,10 @@@ F ext/session/test_session.c 12053e9190
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt f2b23a6bde8f1c6e86b957e4d94eab0add520b0d
 -F main.mk c4335dbdb004d37e00e23d6ff226e55df0db5b21
 +F main.mk f045701c66fec66208bc35d79de372340916e81e
  F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
  F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
- F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
+ F mkextw.sh d2a981497b404d6498f5ff3e3b1f3816bdfcb338
  F mkopcodec.awk f6fccee29e68493bfd90a2e0466ede5fa94dd2fc
  F mkopcodeh.awk 29b84656502eee5f444c3147f331ee686956ab0e
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -197,7 -185,7 +198,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c c48f7f3f170e502fe0cc20748e03c6e0b5a016c2
- F src/main.c 893986530b7ea4607643675babf08888cb63e48e
 -F src/main.c a1f4bb79e15c3f0a2e4efb2f52781ccbfb3010d4
++F src/main.c a27560235a8e0e3f1a94aaca30189431bf61e776
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -222,23 -210,23 +223,23 @@@ F src/parse.y 9acfcc83ddbf0cf82f0ed9582
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
  F src/pcache1.c d23d07716de96c7c0c2503ec5051a4384c3fb938
 -F src/pragma.c 67a611bd4be0754f27ee13eb87932c3b14415862
 +F src/pragma.c 057f5b1343c9a79e3e6c0c542a3a08b85849ee61
  F src/prepare.c 2306be166bbeddf454e18bf8b21dba8388d05328
- F src/printf.c bff529ed47657098c55c9910b9c69b1b3b1a1353
+ F src/printf.c 41c49dac366a3a411190001a8ab495fa8887974e
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
  F src/resolve.c 89f9003e8316ee3a172795459efc2a0274e1d5a8
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 91b62654caf8dfe292fb8882715e575d34ad3874
- F src/shell.c a02544af6697c5782d29ec3204616f35ed9e8458
- F src/sqlite.h.in 0693f95792b64cca4d1780c082d7b96fd32aa1c3
+ F src/shell.c c8cd06e6b66250a3ea0149c4edec30de14f57b6f
 -F src/sqlite.h.in 0a87152a6dde55381afb8f1cf37f337b2f32fd06
++F src/sqlite.h.in fb8adf7852fb92e410de422b5569923327bf8a2c
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
- F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
- F src/sqliteInt.h 5a005fde923b3755fa3184e60028c582a8efe01d
+ F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 -F src/sqliteInt.h e461e0f9109ca49ad6aba52198fbe7d237c4a75b
++F src/sqliteInt.h a83b0cef30022c46a19e6ace1f668b7833935eed
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c b8835978e853a89bf58de88acc943a5ca94d752e
 +F src/tclsqlite.c e0eaf3a78eca2ef650abb67b6571cc86abcb5f87
- F src/test1.c 06bd01f7795bbef4aaf59d3b9fe5b3131a6ef642
+ F src/test1.c 870fc648a48cb6d6808393174f7ebe82b8c840fa
  F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@@@ -280,29 -268,29 +281,29 @@@ F src/test_superlock.c 2b97936ca127d139
  F src/test_syscall.c 16dbe79fb320fadb5acd7a0a59f49e52ab2d2091
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
  F src/test_thread.c 1e133a40b50e9c035b00174035b846e7eef481cb
- F src/test_vfs.c 8e6087a8b3dcc260282074b0efba14b76311120c
+ F src/test_vfs.c 12d9931f65acde64961523b6f420ba7cd057fbd7
  F src/test_vfstrace.c 34b544e80ba7fb77be15395a609c669df2e660a2
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
- F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
+ F src/tokenize.c e0e8fd3cb90a88451f6b6425726c84747b6b20d7
  F src/trigger.c 5c0ea9b8755e7c5e1a700f3e27ac4f8d92dd221e
 -F src/update.c 8e76c3d03e4b7b21cb250bd2df0c05e12993e577
 +F src/update.c 19daebf6a0a67af5524913e93498d08388792128
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
  F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9
- F src/vacuum.c ddf21cc9577c4cb459d08bee9863a78ec000c5bb
- F src/vdbe.c e1782e46404dd5aeb26d49e2180be6efcb6a2334
+ F src/vacuum.c d9c5759f4c5a438bb43c2086f72c5d2edabc36c8
 -F src/vdbe.c 2e3fc618ff964cd559844fdbf186fdc582b66b1e
 -F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d
 -F src/vdbeInt.h aa185c6df4f2b5ec9896cdb5f96789af1ef69f76
 -F src/vdbeapi.c e3ad4cddb713a387527f982e79d9e001a0dbffa5
 -F src/vdbeaux.c 9683f262c7fd0af8cb03f0053651135005cdda8a
 -F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69
++F src/vdbe.c 7e1654d4ac01f017aad8088a1225e514b2aef5cf
 +F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683
- F src/vdbeInt.h 1ca0f9ae9e9c28823647749edb767ea9ef2176d1
- F src/vdbeapi.c c45805f7acd2a07444b3d3b63853eb96545ec5f0
- F src/vdbeaux.c 2e82e249a0b72e9c2b63d16ec7801a966ff6a182
++F src/vdbeInt.h 11feb11eb49d8b312741011d30d91c9c50b59de0
++F src/vdbeapi.c bb28ee14bae43579b33d88e0d916a1657255a866
++F src/vdbeaux.c 84f5fb7cb2f62fd8b8a37b96ac929221cc77d317
 +F src/vdbeblob.c 1268e0bcb8e21fa32520b0fc376e1bcdfaa0c642
  F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab
  F src/vdbesort.c 3937e06b2a0e354500e17dc206ef4c35770a5017
- F src/vdbetrace.c 18cc59cb475e6115129bfde224367d13a35a7d13
+ F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
  F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
- F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
+ F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
- F src/where.c 9bcfcb4ec6a14dd0111bf287bee02be88d5709f9
+ F src/where.c f5201334501cd23a39315cab479c0dcce0990701
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@@ -719,10 -708,10 +721,10 @@@ F test/pagerfault2.test caf4c7facb914fd
  F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
  F test/pageropt.test 6b8f6a123a5572c195ad4ae40f2987007923bbd6
  F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
- F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
+ F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
- F test/percentile.test 4614301e38398df7fdd5f28f4ed8f272b328251b
+ F test/percentile.test b98fc868d71eb5619d42a1702e9ab91718cbed54
 -F test/permutations.test 461ef4ea10db02cd421dfe5f988eac3e99b5cd9a
 +F test/permutations.test 742b8005bb3c782797a20beccdbe213ef52531fb
  F test/pragma.test 5e7de6c32a5d764f09437d2025f07e4917b9e178
  F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -1111,7 -1101,7 +1115,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 1d44e5d3c2b1dc958442f9114a960b256e002ed3
- R 28f75ac347bd281672cb0a8d27d3f6b3
- U dan
- Z 01296a7a6fdc241a613ea24758428ad2
 -P 52a49cbc1621094b2fe2b021209b768d29e0426b f2ab8747825ab5131ffab174aa0ffe5e474f6811
 -R f4d92c08ade3445d4abd0e6606f44c69
++P 1452defb8cfcc489230314dd1e0425feba46c49d 1e39f85077f1f2b96c3a656c5b6334bafb005908
++R 996effd12b4e262519df6f6e538dae74
+ U drh
 -Z 1ae873026565d0007b698ed53e93eb8a
++Z 08707dac307041af534ddfd35863fca1

diff --cc manifest.uuid
index 44d88b34c030065ca20923f1eda220e3e46cc44d,b2a7e956cd2684f622edb258bd977f3fd6e3b74b..d864f435a3378920dfa1f1fe53563dc4f255e144
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1452defb8cfcc489230314dd1e0425feba46c49d
 -1e39f85077f1f2b96c3a656c5b6334bafb005908
++af3ca4c6e557e6bc92584586b5a97d9be41b0b82

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/vdbe.c
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeapi.c
index 6fb45edb84437d306e9bee23a56120fa4d392a34,efa9e96962279799f6a9b5ded72e02ec4d65c798..b97faaf404ce9162b4a9b8b0176b966f075c6583
--- 1/src/vdbeapi.c
--- 2/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@@ -386,9 -386,7 +386,9 @@@ static int sqlite3Step(Vdbe *p)
        db->u1.isInterrupted = 0;
      }
  
-     assert( db->writeVdbeCnt>0 || db->autoCommit==0 
 -    assert( db->nVdbeWrite>0 || db->autoCommit==0 || db->nDeferredCons==0 );
++    assert( db->nVdbeWrite>0 || db->autoCommit==0 
 +        || (db->nDeferredCons==0 && db->nDeferredImmCons==0)
 +    );
  
  #ifndef SQLITE_OMIT_TRACE
      if( db->xProfile && !db->init.busy ){

diff --cc src/vdbeaux.c
Simple merge