Update this branch with latest trunk changes.

FossilOrigin-Name: 249cd361b840913794b7cd2f2d42777dcd547a60

diff --cc manifest
index a6c352d7e84b0f28287811d1889fffdd1b433d3c,056a1fb6f322fb39770331b784b0eb67a644071b..4540ae7f7547e1443fb9a6fc360d3c8afa450156
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
- D 2016-03-09T08:08:51.626
 -C Fix\sthe\spermutations.test\sscript\sso\sthat\sit\sworks\sagain.
 -D 2016-03-14T21:26:25.596
++C Update\sthis\sbranch\swith\slatest\strunk\schanges.
++D 2016-03-15T09:42:39.387
  F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@@ -350,12 -351,11 +351,12 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c b8f7174e5f8c33c44ded3a25a973d0bb89228c20
  F src/rowset.c 9fe4b3ad7cc00944386bb600233d8f523de07a6e
  F src/select.c 137b31daa84d57d67847bf621bb54f3353e2077b
 -F src/shell.c 5e0ab1e708dc294330ccd8230536e1801f60822e
 -F src/sqlite.h.in 0235586b3fb639e85998d495c90f007657fd82af
 +F src/shell.c 4aba7844546ffd02b728a9509226a6e3c0462f77
 +F src/shell_indexes.c 23c4b7f7bb8e9b0a8b912c389a85922939bb0769
 +F src/sqlite.h.in 9f0fee10494624d03686fabcc270ce8d12fcb65b
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h dc193eb8a9922528a370eae11e2e66886e0f29a3
 -F src/sqliteInt.h 84c673f27b77dfbd367cb3ed1de8b6f3b73102dc
++F src/sqliteInt.h 8c95b3589d084ea68e947aa84abc32f185ed6155
  F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -430,7 -430,7 +431,7 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 10deb6b43887662691e5f53d10b3c171c401169b
  F src/wal.h 2f7c831cf3b071fa548bf2d5cac640846a7ff19c
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c 2cbcacd9ae9bc8570cb83eaf3400700dbf90ac87
 -F src/where.c 5533002ddf4fbc256f450cb629668a200b06a3ce
++F src/where.c b8566be7e2e195053238874d4f3bc4abf9e36b40
  F src/whereInt.h 93297d56edd137b7ea004490690fb6e2ce028a34
  F src/wherecode.c 863aedf086131743763c1960637fde904eadc442
  F src/whereexpr.c fb87944b1254234e5bba671aaf6dee476241506a
@@@ -1458,7 -1456,7 +1459,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 fc18cc9293fb0080b7152c16baac49f44e2db7b3 8baa2c2c7698e03418531482a8314a5d7ae2c7d3
- R 450ba648de3c5f9783d9a3140277593a
 -P f4693ba4bbd9738b45012cf507fc0d7b6d04b7ee
 -R b91725f8858bc448d609dcaeb28fa81e
 -U drh
 -Z 51ddcfc985bc0e936856bdb8a64dca36
++P 59caca4387e97231834a3bffdbed8636be4e8e19 9f194f90c07d5415b1d6bb10ec049f74999d6885
++R 5b90dca0c628375a48db229132bb19b2
 +U dan
- Z 1186a7b0c3808314b7a93e4b95a66f1c
++Z dd17403945ec5cf2087723aff15fb7cd

diff --cc manifest.uuid
index 3e67f3151ecb6932bba42873c0462bf3664de249,bac1f45a1664f586435c65ffc37fb545e2cdd2fa..234da9ff63c7d04af4e4dbe6e8d4b04525ecb5c5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 59caca4387e97231834a3bffdbed8636be4e8e19
 -9f194f90c07d5415b1d6bb10ec049f74999d6885
++249cd361b840913794b7cd2f2d42777dcd547a60

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/where.c
Simple merge