Merge recent trunk changes with this branch.

FossilOrigin-Name: c71f23590c25b4cecd27722e6c0fc8e3bf320d399c7d9398b7016dd5cf5b05eb

diff --cc manifest
index cfc858f82353a19ebfd8427d4cc600508e6600dc,3e06caf3c1320234fe1db1a5052dbe1e303a4628..a86004ffdd4a063050c7a1c97a0f5506a2e8a1ea
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Update\sthe\samalgamation\sbuild\sscript\sto\sinclude\swindow.c.
- D 2018-06-09T17:58:51.834
 -C Slightly\ssmaller\sand\sfaster\scode\sby\sencapsulating\swal-index\shash\stable\nlocation\sinformation\sin\sa\sseparate\sWalHashLoc\sobject\srather\sthan\spassing\naround\sthe\svarious\selements\sas\sseparate\svariables.
 -D 2018-06-09T16:49:00.305
++C Merge\srecent\strunk\schanges\swith\sthis\sbranch.
++D 2018-06-09T18:09:44.345
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 -F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da
 +F Makefile.in 498b77b89a8cb42f2ee20fcd6317f279a45c0d6ff40d27825f94b69884c09bbe
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 681fb88cccf1fd58c0b9648f6a09b75332206ef72ca76012ad11699c320cec5f
  F README.md 7764d56778d567913ef11c82da9ab94aefa0826f7c243351e4e2d7adaef6f373
@@@ -436,10 -436,10 +436,10 @@@ F src/auth.c a38f3c63c974787ecf75e3213f
  F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c c38cd920641bf05c932caf657524927115c721489f14cc109efc4da5c43205b2
 -F src/btree.c 06690f5ad144c5e69dfb68d5ec8ee4819c6d40f4b8bc77aa97975938f59d928c
 -F src/btree.h ab639c4b9b210b8f4cd7a3a922af73df9a3f27c1d124267339fd73ef8619f488
++F src/btree.c 671207d68ac2fb32c782f9b65cd6f8a861757044b1448098cb08fab4fcf02947
 +F src/btree.h 7b557914561f60a0eb76c2e22c23ab5b82f87b734a91c1b9385654b6474fdf7f
  F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
- F src/build.c 5fc41458505331bfb0c175f40b9a13cb335f826bed3ae311aaae000c132d7b16
+ F src/build.c 3b3bfa88800739e1f11313dcecfba5ef8e4757b6c929cdf7de9fcfc01002b81f
  F src/callback.c 36caff1e7eb7deb58572d59c41cee8f064a11d00297616995c5050ea0cfc1288
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 849d4cebe008cfc6e4799b034a172b4eaf8856b100739632a852732ba66eee48
@@@ -500,7 -500,7 +500,7 @@@ F src/shell.c.in 4d0ddf10c403710d241bf9
  F src/sqlite.h.in 63b07f76731f2b1e55c48fdb9f0508dcc6fbe3971010b8612ffd847c3c56d9a1
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 9887b27e69c01e79c2cbe74ef73bf01af5b5703d6a7f0a4371e386d7249cb1c7
- F src/sqliteInt.h 8cdd2f8c920cc7de683c27322d2f146079bc36ad267b63eaf9ee186ee58e287f
 -F src/sqliteInt.h 9332b820382288dde7d6ea712bbcd34380bbbeb44f6f7032710bd5240fd4067d
++F src/sqliteInt.h 04c732e9e770d35c12f5e649b7288510f3a2abb238e32eadaf506678717ddb25
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -576,14 -576,13 +576,14 @@@ F src/vdbesort.c 731a09e5cb9e96b70c394c
  F src/vdbetrace.c 79d6dbbc479267b255a7de8080eee6e729928a0ef93ed9b0bfa5618875b48392
  F src/vtab.c 10ea07dec111de6fb0a4fc87a7ffa4c65fdc088a19dbfaf7d6f2b128f2e8eb7b
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
- F src/wal.c aa9cffc7a2bad6b826a86c8562dd4978398720ed41cb8ee7aa9d054eb8b456a0
+ F src/wal.c d44a0811afd2155b1157c38b33141d4ac028fda6232485bed664015bb05819ca
  F src/wal.h 8de5d2d3de0956d6f6cb48c83a4012d5f227b8fe940f3a349a4b7e85ebcb492a
  F src/walker.c da987a20d40145c0a03c07d8fefcb2ed363becc7680d0500d9c79915591f5b1f
- F src/where.c 7dcb13bbcfd8c926546946556014c8f5aa0829eb8b65a6c18f8d187d265200a5
- F src/whereInt.h b09753e74bf92a8b17cf0e41ca94c44432c454544be6699b5311dcc57bf229c6
+ F src/where.c fe1a6f97c12cc9472ccce86166ba3f827cf61d6ae770c036a6396b63863baac4
+ F src/whereInt.h b90ef9b9707ef750eab2a7a080c48fb4900315033274689def32d0cf5a81ebe4
  F src/wherecode.c 3317f2b083a66d3e65a03edf316ade4ccb0a99c9956273282ebb579b95d4ba96
- F src/whereexpr.c e90b2e76dcabc81edff56633bf281bc01d93b71e0c81482dc06925ce39f5844a
+ F src/whereexpr.c 6f022d6cc9daf56495f191b199352f783aff5cf268ba136b4d8cea3fb62d8c7d
 +F src/window.c 72c08229b59a447db5ffb8e87680105549465df502092e0e24f9451e6b082031
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@@ -1740,7 -1731,7 +1740,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P ceaf798ea09184bc0e7d3dcf3ad4d909d2e4e7018754a8417a813f33010140a7
- R 25d876301d00e59b71583c6b55d6c00d
 -P 31e480f68dfd887cfd9114f9f9fec53d751d3ecc27e36f55c0166b51b2fbb08c
 -R 6ae6039dbf6c75d53dff2e4ab7fb3afb
 -U drh
 -Z 6ec430bc7e585373e73f8d45e5d8a30b
++P 21d2f4a62eceab0de0b4669bf3e81eb71512211ed710ce0eb525695fb7309d6b 538a365b7a32ab7fa84f59d7556242cfb59b76d287b6417eb3a823197a354e8e
++R 6acfedbb724c9a0a79fb2548396e647b
 +U dan
- Z 68e027e36121929eecffb8d7c085a490
++Z fb63cabb1c512a4c919ea08381d46601

diff --cc manifest.uuid
index 03ca7e782fe98bb3cdd50e3605675d134ca36e2f,15b5d5a674b1f8bb331bbce95e43cb9d1a860943..d4d8d10f24db84cbe3920e782537f528d8c08a56
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 21d2f4a62eceab0de0b4669bf3e81eb71512211ed710ce0eb525695fb7309d6b
 -538a365b7a32ab7fa84f59d7556242cfb59b76d287b6417eb3a823197a354e8e
++c71f23590c25b4cecd27722e6c0fc8e3bf320d399c7d9398b7016dd5cf5b05eb

diff --cc src/btree.c
Simple merge

diff --cc src/sqliteInt.h
index 5eaab0d6a317e84c51deda08702467319fda8dfb,98bd7e407908be954a91634693b479b40731f1cb..7d4c3ea713b07cb5e7d35cb01441a338f4f74bc9
--- 1/src/sqliteInt.h
--- 2/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@@ -1107,9 -1107,34 +1107,35 @@@ typedef struct VTable VTable
  typedef struct VtabCtx VtabCtx;
  typedef struct Walker Walker;
  typedef struct WhereInfo WhereInfo;
 +typedef struct Window Window;
  typedef struct With With;
  
+ 
+ /*
+ ** The bitmask datatype defined below is used for various optimizations.
+ **
+ ** Changing this from a 64-bit to a 32-bit type limits the number of
+ ** tables in a join to 32 instead of 64.  But it also reduces the size
+ ** of the library by 738 bytes on ix86.
+ */
+ #ifdef SQLITE_BITMASK_TYPE
+   typedef SQLITE_BITMASK_TYPE Bitmask;
+ #else
+   typedef u64 Bitmask;
+ #endif
+ 
+ /*
+ ** The number of bits in a Bitmask.  "BMS" means "BitMask Size".
+ */
+ #define BMS  ((int)(sizeof(Bitmask)*8))
+ 
+ /*
+ ** A bit in a Bitmask
+ */
+ #define MASKBIT(n)   (((Bitmask)1)<<(n))
+ #define MASKBIT32(n) (((unsigned int)1)<<(n))
+ #define ALLBITS      ((Bitmask)-1)
+ 
  /* A VList object records a mapping between parameters/variables/wildcards
  ** in the SQL statement (such as $abc, @pqr, or :xyz) and the integer
  ** variable number associated with that parameter.  See the format description