Merge recent trunk changes into the threads branch.

FossilOrigin-Name: 163c247bd8280ab14fe577329c631c8bd884707f

diff --cc manifest
index 1af171baaa01a79014c2abf94c08b322bcefbbd6,4de9f86a2734133b230408252981ca02541abf57..006de9f2729b11b7023a69bb5c9ee6dbdf837685
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Improvements\sto\scomments\sin\sthe\smulti-threaded\ssorter.\s\sAlso\sinclude\sa\nfunction\sname\schange\sfor\sclarity.\s\sAnd\sadd\sa\stest\sto\shelp\sshow\sthat\sthe\nMergeEngine\sobject\sis\sonly\sused\sby\sa\ssingle\sthread.
- D 2014-07-28T14:54:50.442
 -C Remove\san\sunreachable\sbranch\sfrom\sthe\ssqlite3_value_numeric_type()\sinterface.
 -D 2014-07-26T20:12:56.006
++C Merge\srecent\strunk\schanges\sinto\sthe\sthreads\sbranch.
++D 2014-07-28T15:01:37.313
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 +F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b
 +F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07
@@@ -167,10 -167,10 +167,10 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 32b552d5388fa27adf99b9d7e09f4746a08da4e7
 -F src/btree.c b5531339cd826af46b9621e4a9323971a9380e12
++F src/btree.c dff8e7789730e835b66d81f9eb68de2352845012
  F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
  F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
 -F src/build.c 48f400fa14fd6add244b954ce7e223ce7ccacf0b
 +F src/build.c af833cdcba64a465eeba5f2d0c9fc012a9f6c31d
  F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
@@@ -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 191129c3f7a9cf241aea90ff6a6be3e74d3767f0
 -F src/sqlite.h.in ac4451c9da2771d2f4d702ef89722407242906d9
 +F src/select.c 2657f35be771d14f56402e4aa8a7e26562415ae6
 +F src/shell.c 05e9e7f667a6340643b647c4be0db15dd7627d92
 +F src/sqlite.h.in a30af69fcbc8fab8b4a00032f9f1d24ba2f01c2c
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 7d3b81b03c714486968a04a2583bc14e5cf14fcf
 -F src/sqliteInt.h 068e42f41a09ce6b9edbe194ac8a470ab53145df
++F src/sqliteInt.h f2b28ce01099fdeb75a222aeddeece7384c9d56a
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -284,14 -283,14 +284,14 @@@ F src/update.c 01564b3c430f6c7b0a35afaf
  F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05
  F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 7ba7cc297e30d46901038d3d304fbf9914811c86
 -F src/vdbe.c b127f05ff110c1f640b5aff98fa57d5028c8f2ee
++F src/vdbe.c c28f377d29cfa4db713581fc3a134642e38d9fcf
  F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
- F src/vdbeInt.h 5e925f50d1a52c392304b73f13c23bf3715fc138
 -F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df
++F src/vdbeInt.h 8870adf012235708f125f8cd1c988f487dc3eb6f
  F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949
- F src/vdbeaux.c 68ef480fa75b27d5860fb96ca4f5a9af98ba102f
 -F src/vdbeaux.c ac063f36c929f88bf6cecdbcc413000e272265bb
++F src/vdbeaux.c 3f1d2baa4a8cbdad33cb255a5f4fd1af7a414683
  F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
  F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
 -F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27
 +F src/vdbesort.c ef998096c8b2a1a85fbd730183a9b62f652e1af3
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
@@@ -1189,7 -1184,7 +1189,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 770685892c8f09b9cddb2fbb2877cfb291e19425
- R d6f4c6811acb8e4555290f0ceab890b8
 -P 413d7287977702fa651c0140bd5cf29021fe3e79
 -R 882befeb8b61995267c9bc4311daa690
++P 9af50a878f67c1c2a4f1520160cc989650d7196a 5350229b52b18a4961858a30538c5c75e5bd3048
++R c247ffbe0be6e5ba20860955ecb933f2
  U drh
- Z 8438d80edf2a72a2fe3b270fb06c810d
 -Z 28fa8e103cbfa69958d1f03600e24fde
++Z eec00caa889efc5f1f3b6e693b6885aa

diff --cc manifest.uuid
index 64a549188ecd9c203ba789a5c06315e9295f5ca3,58f6f007dbbccffdbdddda9753e5437493c8953a..2637b6c6f7c3fbc9910ab21156e78d088ae28e0e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9af50a878f67c1c2a4f1520160cc989650d7196a
 -5350229b52b18a4961858a30538c5c75e5bd3048
++163c247bd8280ab14fe577329c631c8bd884707f

diff --cc src/btree.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
index df470d4034779eb827b4f1d1711c1115f2f43cb9,a00a1da836f43bc2310660b1536be51ad71b11db..8251ca9aecd5f2aa82655ca6b4e618248485de33
--- 1/src/vdbe.c
--- 2/src/vdbe.c
+++ b/src/vdbe.c
@@@ -4513,8 -4555,11 +4578,11 @@@ case OP_Rewind: {        /* jump *
    assert( pC!=0 );
    assert( isSorter(pC)==(pOp->opcode==OP_SorterSort) );
    res = 1;
+ #ifdef SQLITE_DEBUG
+   pC->seekOp = OP_Rewind;
+ #endif
    if( isSorter(pC) ){
 -    rc = sqlite3VdbeSorterRewind(db, pC, &res);
 +    rc = sqlite3VdbeSorterRewind(pC, &res);
    }else{
      pCrsr = pC->pCursor;
      assert( pCrsr );

diff --cc src/vdbeInt.h
Simple merge

diff --cc src/vdbeaux.c
Simple merge