Merge in all the latest updates and enhancements from trunk.

FossilOrigin-Name: 67587a3348b84424b2ab1f2df1ea923a5168e2e4

diff --cc manifest
index f65f205e5e7364c9e141087be62b93a5f5ca0a01,9af4bbc0dc0f8fd5be1981939fa7b6933f8af1a3..48fcb7f92565a71b842720011594e3895ec5c198
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sin\sthe\slatest\schanges\sfrom\strunk.
- D 2013-08-06T14:52:27.425
 -C Fixes\sfor\sharmless\scompiler\swarnings.
 -D 2013-08-19T11:15:48.054
++C Merge\sin\sall\sthe\slatest\supdates\sand\senhancements\sfrom\strunk.
++D 2013-08-19T12:49:06.766
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 +F Makefile.in aff38bc64c582dd147f18739532198372587b0f0
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc e9f41f89111627baaabd95cab4988b8d1c3e47c9
 +F Makefile.msc e5cc521bbc9fb09f032f7fef563542da7ac5544a
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION f135b651727f978b7191bd6fa12c7fc1e13e13ac
@@@ -184,8 -171,8 +184,8 @@@ F src/callback.c d7e46f40c3cf53c43550b7
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
  F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 -F src/delete.c 2317c814866d9aa71fea16b3faf4fdd4d6a49b94
 +F src/delete.c 30ed4bc76a1a32c55bf17ac1528c5867aa5502c0
- F src/expr.c 7e55edefb8bd0b35b382ce9226c58472cd63a443
+ F src/expr.c 0bbb44462a19169189b2709fbbd800950521b5ae
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 914a6bbd987d857c41ac9d244efa6641f36faadb
  F src/func.c 5c50c1ea31fd864b0fe921fe1a8d4c55acd609ef
@@@ -198,7 -185,7 +198,7 @@@ F src/journal.c b4124532212b6952f42eb2c
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c e3ce4cb4a9d0634ce74b9711bd800405ae470954
 -F src/main.c dc02c7c118d58049e0cccc6c9c47c0a4d3e2bcda
++F src/main.c 525985af588234b3d01b48fe856b83d9bdc2d912
  F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
@@@ -227,18 -214,18 +227,18 @@@ F src/pragma.c 1d96ba749253b49bc229c629
  F src/prepare.c fa6988589f39af8504a61731614cd4f6ae71554f
  F src/printf.c 41c49dac366a3a411190001a8ab495fa8887974e
  F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
- F src/resolve.c 17e670996729ac41aadf6a31f57b4e6f29b3d819
+ F src/resolve.c 9d53899cc6e1f4ec0b4632d07e97d57827bf63b9
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 8b148eb851f384412aea57091659d14b369918ca
- F src/shell.c 927e17b37b63b24461e372d982138fb22c4df321
- F src/sqlite.h.in 9dbc04c103f297d2bd26c7e323f0bdb9aaf0dc8a
+ F src/shell.c 909f6c4a52c8e0265ce0048e2b3cbadda1bd6051
 -F src/sqlite.h.in bd1451ba1ab681022a53bccc3c39580ba094a3ff
++F src/sqlite.h.in dcca940021f8f6643630fb7711bfd4e3fa002566
  F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 1f9abddff71bbce4f51d275d3dc5262ceae7aa61
 -F src/sqliteInt.h eae58298bc7c9a491ad2fc6c600f534b74be8a11
++F src/sqliteInt.h a24a7f54dd59e8f59d67f7ab0682b5c22f554855
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c e0eaf3a78eca2ef650abb67b6571cc86abcb5f87
 -F src/tclsqlite.c 659dad8ef30b54831306a244b43e37af4725a444
++F src/tclsqlite.c a25933b085bde305a59b43e52f5624871db46a1e
  F src/test1.c 870fc648a48cb6d6808393174f7ebe82b8c840fa
  F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
@@@ -249,13 -236,13 +249,13 @@@ F src/test7.c 126b886b53f0358b92aba9b81
  F src/test8.c 7ee77ea522ae34aa691dfe407139dec80d4fc039
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
- F src/test_autoext.c 32cff3d01cdd3202486e623c3f8103ed04cb57fa
+ F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
  F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e
  F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16
 -F src/test_config.c 95bb33e9dcaa340a296c0bf0e0ba3d1a1c8004c0
 +F src/test_config.c 6b614c603cb4db1c996f1b192ca0a46ef0d152cd
- F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
+ F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
- F src/test_fs.c 8f786bfd0ad48030cf2a06fb1f050e9c60a150d7
+ F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f
  F src/test_func.c 3a8dd37c08ab43b76d38eea2836e34a3897bf170
  F src/test_hexio.c abfdecb6fa58c354623978efceb088ca18e379cd
  F src/test_init.c 3cbad7ce525aec925f8fda2192d576d47f0d478a
@@@ -290,12 -277,12 +290,12 @@@ F src/update.c e3668141dd97010236812392
  F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
  F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9
  F src/vacuum.c d9c5759f4c5a438bb43c2086f72c5d2edabc36c8
- F src/vdbe.c 1d95ab3d4aae198744c1c14170b2466b58eb8970
 -F src/vdbe.c 0fbe7a904a1187dc6c8a2dbe2f594f0ce8d01401
 -F src/vdbe.h 4f554b5627f26710c4c36d919110a3fc611ca5c4
 -F src/vdbeInt.h e9b7c6b165a31a4715c5aa97223d20d265515231
 -F src/vdbeapi.c 4d13580bd058b39623e8fcfc233b7df4b8191e8b
 -F src/vdbeaux.c a6ea36a9dc714e1128a0173249a0532ddcab0489
 -F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69
++F src/vdbe.c fab5d86a09f735db4bfd53d977465fa82cd5c213
 +F src/vdbe.h 7aa3ab6210a68471c8490dedfc9aa4ef5684b9a0
 +F src/vdbeInt.h cc1974b94efa98ecaec6fa14a2584d7c1e82eadf
 +F src/vdbeapi.c c8c433043d14b5e00e2ed6f7e44543bcc92d1594
 +F src/vdbeaux.c 6549864e5fffa3d04941551610e4800de72e1be9
 +F src/vdbeblob.c 1268e0bcb8e21fa32520b0fc376e1bcdfaa0c642
  F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab
  F src/vdbesort.c 3937e06b2a0e354500e17dc206ef4c35770a5017
  F src/vdbetrace.c e7ec40e1999ff3c6414424365d5941178966dcbc
@@@ -727,9 -714,9 +727,9 @@@ F test/pagesize.test 1dd51367e752e742f5
  F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d
  F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
  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/pragma2.test 76e4a54cd4677966e4e75f8a7fe86ccbc250de2a
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
  F test/progress.test 552dc1edc37333a8d3098b8c26a2b7f06f5799d7
  F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
@@@ -1119,7 -1105,7 +1119,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P 7e1acb390770d1bd189fac7a3a7f96106f96e3a4 5dcc2d91bd343cd0fac79d3c8f079a5ce534cdf7
- R 16c019af84c40424fdcd3228006de852
 -P 65a85a156f3c827890e9f1fd22484a2f875c3b6f
 -R d8f5ca6c104ad88cbb780c1e3e66f865
++P 69d5bed017bda3e184857febcc8b6f6bed6ad228 a0d9ca4f07f1dc3a189864f8ed9cdb0b1d791b1a
++R 144b203c75da112b948140b14b84bcaf
  U drh
- Z 236e21ad4140ab8f1ddcd5409f261d54
 -Z a9ff7ee6c83dbd598cfc582a60fae5a4
++Z e4751f746fc0244a4adaef8846371a84

diff --cc manifest.uuid
index 4136a8e123cde79d6cddcdd2a8d41723a60bd22d,f6e394cf03189ea8ce7e7d68216955ea9ca9d1bd..965f2035470bb8077cbe5810a4fcbcae00c65e5c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 69d5bed017bda3e184857febcc8b6f6bed6ad228
 -a0d9ca4f07f1dc3a189864f8ed9cdb0b1d791b1a
++67587a3348b84424b2ab1f2df1ea923a5168e2e4

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

diff --cc src/vdbe.c
Simple merge