Merge the latest trunk changes into the threads branch.

FossilOrigin-Name: ae23a65eb1547fbe8b86ab71477071990a22d31d

diff --cc Makefile.in
Simple merge

diff --cc Makefile.msc
Simple merge

diff --cc main.mk
Simple merge

diff --cc manifest
index fa19de4da14c6117b7ea0207b4b6bfaa34626bd6,d5d65422e575fcc00e0730141cb1229b297ab9c3..aebf99f5b0a8b2ff262ac37bed36864c974256fb
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Merge\sin\sall\srecent\schanges\sfrom\strunk,\sand\sespecially\sthe\sautomatic\sindex\nenhancements.
- D 2014-06-18T15:18:12.521
 -C Bump\sthe\sversion\snumber\sto\s3.8.6.
 -D 2014-06-30T19:28:57.595
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sthreads\sbranch.
++D 2014-06-30T20:25:03.546
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 0a3830965158ca1c9ec2998c9b95a1b052b0f378
 -F Makefile.in 1732320ecac3fee229d560d7ef2afa34681d1815
++F Makefile.in 6d74383a20b94af19190af16c73fad69e8127f70
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 5c7513a1e829a33271d1469c6483d7150d6a64a9
 -F Makefile.msc ad60c4d8be35f98fdcca614088b84a91612b2b4c
++F Makefile.msc 936a6cb0ed87b2ad69fc2abf654795f25bc2ccb7
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
- F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
+ F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -146,7 -146,7 +146,7 @@@ F ext/rtree/viewrtree.tcl eea6224b35535
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk ec69ae867a105e5dcae7acdeb7643ee368e45144
 -F main.mk 7850d834ca7f3c772e2b0087631868d5bfdeabb9
++F main.mk bb54c720b96fec4f98c7befae9c29cd23227819b
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -189,7 -189,7 +189,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 67b07f2b22da21b28d9162511b1aba7244ef1e57
 -F src/main.c 7c2c3cafdd6313c8f9319ebec1565782e624372e
++F src/main.c f761e7548a1feaccde82d04c9e008ba9c85ede5a
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -207,8 -207,8 +207,8 @@@ F src/os.c 1b147e4cf7cc39e618115c14a086
  F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
- F src/os_unix.c 9a97268f1ea97ddea17f1c392f7c76197ac4cea9
+ F src/os_unix.c a7baf1b30f3c58ba20b813e01aab23b18ae44f85
 -F src/os_win.c 8dbf6c11780fe2eb96c1f289e664d0c7b2911d37
 +F src/os_win.c 5f8c5568cc749d6ab44006124e7701f463559223
  F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25
  F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
@@@ -222,12 -222,12 +222,12 @@@ F src/printf.c af06f66927919730f03479fe
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 -F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
 -F src/shell.c 56de2dfa3f25def4bf03098f7e2256fbb42f6e3c
 -F src/sqlite.h.in a98eb3e8c86c934ea6f5bcfc6b69653dde2f4ed4
 +F src/select.c 2657f35be771d14f56402e4aa8a7e26562415ae6
- F src/shell.c 3ac174189f52b149a30b0021c4e8428c877d90d1
++F src/shell.c 2aa1fd880d91bbb70d06e70e3097c3b29f946890
 +F src/sqlite.h.in faf9dadad407b0d5dd9e5bea26c021e1e31813b1
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 00cd3cf7be9ea28b963773de165eeb800c94d17c
 -F src/sqliteInt.h e88614d7371b80ff69dbbb5e4b9813ee93dfd890
++F src/sqliteInt.h 54cf6813e9bce8f249f16fd1edcb899a5d19fe37
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -281,17 -280,17 +281,17 @@@ F src/threads.c 3c63f60ce0aae4c40ed4b8d
  F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7
  F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
  F src/update.c 01564b3c430f6c7b0a35afaf7aba7987206fa3a5
- F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
+ F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
  F src/util.c 049fe1d3c0e2209c1bee107aec2fcff6285f909f
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
 -F src/vdbe.c 9bfe6becfc094382ae213656fbe511055ad83a54
 +F src/vdbe.c 1dff86d8a861b24a7636a2f586953ceb483b445f
- F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
- F src/vdbeInt.h c78ace64dc37495806dd50596eded1f6cd2b5a64
+ F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
 -F src/vdbeInt.h 5df5e9afe9b7839cd17256220fc4f7af84b8b1cd
++F src/vdbeInt.h 027a5757abfed6492b017b45cb2daade9642e467
  F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
- F src/vdbeaux.c 44d4d1f5711f71eaf0d624de5c3e4976fe4e180b
 -F src/vdbeaux.c 8ce7dcdbb8c59e5c2194518ce3099b254ae94c15
++F src/vdbeaux.c 49c799bd26f9443eb08ed1bf558cf6ec5d166801
  F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
- F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
+ F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
 -F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27
 +F src/vdbesort.c e2784e2e1f1819a55ce6f22c6ab22eca576ae6d8
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
@@@ -830,13 -829,10 +830,14 @@@ F test/shrink.test 8c70f62b6e8eb4d54533
  F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
  F test/skipscan1.test 28c7faa41a0d7265040ecb0a0abd90c0904270b2
  F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a
+ F test/skipscan5.test d8b9692b702745a0e41c23f9da6beac81df01196
  F test/soak.test 0b5b6375c9f4110c828070b826b3b4b0bb65cd5f
  F test/softheap1.test 40562fe6cac6d9827b7b42b86d45aedf12c15e24
 -F test/sort.test 0e4456e729e5a92a625907c63dcdedfbe72c5dc5
 +F test/sort.test 688468cef8c9a66fcc1d54235de8e4deac745690
 +F test/sort2.test c5e25eb674689e291d06b5209fe8d337ae0ec010
 +F test/sort3.test 6178ade30810ac9166fcdf14b7065e49c0f534e2
 +F test/sort4.test 971452fd4e2928e6fc05c3868396ad7d5f9ce2ad
 +F test/sortfault.test 1a12b6e27d475f50658a8164aaa34f0080a86b36
  F test/speed1.test f2974a91d79f58507ada01864c0e323093065452
  F test/speed1p.explain d841e650a04728b39e6740296b852dccdca9b2cb
  F test/speed1p.test b180e98609c7677382cf618c0ec9b69f789033a8
@@@ -1184,7 -1182,7 +1187,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P e4b01676d7e7ac14f5120ca3a618cc34dbf5dab2 0a52bddd9db49b2b79fc24888b50023d0fe74f7b
- R 577e5bd1b61fe7b4ae68cf3df66c1682
 -P d09ca6d5efad3e4cfa93a4dc711e6ba6079d4b4b
 -R 0b9fd011a99704759c36a48aebd29593
++P 0e1b73496f861bd497f92f1ead936b2d94aa52d5 f925e9baafea625f63105f8013abb3807b418379
++R e2fe9819eb548cf2ae1e2b1637c3598f
  U drh
- Z d5db82952ebf5e7f1ce903e5ad76fefc
 -Z 99f7c1257c18120424d63d4c4b9a073c
++Z 09ae0863e1f9ef792685936307cd2a9a

diff --cc manifest.uuid
index c221d630f7d92efc8f738c7a34d5e07a9700360a,708593f343348243d3958667794f0014fea6a807..cb2d6be8881753f39b6813257869fffdaa0cee24
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0e1b73496f861bd497f92f1ead936b2d94aa52d5
 -f925e9baafea625f63105f8013abb3807b418379
++ae23a65eb1547fbe8b86ab71477071990a22d31d

diff --cc src/main.c
Simple merge

diff --cc src/shell.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeaux.c
index 3f52dd6017fbacd63d59cec37c2ea3e9d654d591,de61b55c835f459b8e3de96b5bdd2f97e95b7fc9..e12e04e5cdc307c5d4693751ef295f501b3b17e6
--- 1/src/vdbeaux.c
--- 2/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@@ -3602,7 -3587,10 +3602,10 @@@ int sqlite3VdbeRecordCompare
    /* rc==0 here means that one or both of the keys ran out of fields and
    ** all the fields up to that point were equal. Return the the default_rc
    ** value.  */
-   assert( vdbeRecordCompareDebug(nKey1, pKey1, pPKey2, pPKey2->default_rc) );
+   assert( CORRUPT_DB 
 -       || pPKey2->default_rc==vdbeRecordCompareDebug(nKey1, pKey1, pPKey2) 
++       || vdbeRecordCompareDebug(nKey1, pKey1, pPKey2, pPKey2->default_rc) 
+        || pKeyInfo->db->mallocFailed
+   );
    return pPKey2->default_rc;
  }
  
@@@ -3759,7 -3751,12 +3762,10 @@@ static int vdbeRecordCompareString
      }
    }
  
-   assert( vdbeRecordCompareDebug(nKey1, pKey1, pPKey2, res) );
 -  assert( (res==0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)==0)
 -       || (res<0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)<0)
 -       || (res>0 && vdbeRecordCompareDebug(nKey1, pKey1, pPKey2)>0)
++  assert( vdbeRecordCompareDebug(nKey1, pKey1, pPKey2, res)
+        || CORRUPT_DB
+        || pPKey2->pKeyInfo->db->mallocFailed
+   );
    return res;
  }