Merge trunk changes into the cursor-hints branch.

FossilOrigin-Name: fbe637620fb7f2c9395c9ddac77d26746d6d4178

diff --cc manifest
index 6edcf0f699bbfc09b3acfeb541c7fc0f0782f307,54da3e34203fed26268a36e564bb8b0320598d9c..1db1a35aeb68164ada9e911f2613935b37dcc667
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\senhancements\sfrom\strunk.
- D 2015-09-15T17:31:47.812
 -C Strengthen\sthe\simplementations\sof\sxShmMemoryBarrier\son\sboth\sthe\sunix\sand\nwindows\sVFSes,\sso\sthat\sthey\slikely\swork\seven\sif\sSQLITE_THREADSAFE=0\sis\sused.
 -D 2015-09-24T12:40:43.573
++C Merge\strunk\schanges\sinto\sthe\scursor-hints\sbranch.
++D 2015-09-24T15:06:30.389
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239
+ F Makefile.in e1afa6fb2de2bddd50e0ddae8166c2ee9d69b301
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc b268d8be2e800b9d35f074b1ed6b2f698deebdd6
+ F Makefile.msc f090cdf036f3c07fb13aa2f4494e388c0b1ed1e4
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION ccfc4d1576dbfdeece0a4372a2e6a2e37d3e7975
@@@ -279,11 -279,11 +279,11 @@@ F src/alter.c 4911e1f18fc11b60edbc64106
  F src/analyze.c 4c308880cf53c558070cb8513bdff4ffb1a38a77
  F src/attach.c e944d0052b577703b9b83aac1638452ff42a8395
  F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
- F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452
+ F src/backup.c c3a9c4209439b806c44cf30daf466955727bf46c
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 9d19d3f8dcddd1b644b72f1c6613d44692a7a846
 -F src/btree.c 164583151135a3764672c2c25aa8e4fa06bdb12b
 -F src/btree.h 40189aefdc2b830d25c8b58fd7d56538481bfdd7
++F src/btree.c 9c791540434eef573ea7d3d5b7d77d66678be3d8
 +F src/btree.h 9cc758f0f1e0002049d9eb0232f9783f21f25ac5
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
  F src/build.c 8a86f4203ac8a9ac0734f242a96f043edffb6018
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
@@@ -291,8 -291,8 +291,8 @@@ F src/complete.c addcd8160b081131005d5b
  F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
  F src/date.c fb1c99172017dcc8e237339132c91a21a0788584
  F src/dbstat.c e637e7a7ff40ef32132a418c6fdf1cfb63aa27c7
- F src/delete.c 5ab483f15aaf202290227d5dd1f10a7ecce3d6b1
+ F src/delete.c 371df4fc86e96efeaed3d37565aef77f956be109
 -F src/expr.c 3a76afcdac925294c39903b7002ddb9e5fd29863
 +F src/expr.c 572ebfeb5c848e8d32096c823f87baa1eb988391
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 83e1baba999bed3144ea5a2143fc922edf51135f
  F src/func.c ecdd69ec6a1e406f04cc73324be2ebbf6354197f
@@@ -338,14 -338,14 +338,14 @@@ F src/pragma.h 631a91c8b0e6ca8f051a1d8a
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
  F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
- F src/resolve.c 3126f7694b8ce0f97282d7dd3a5198b8fa18dce9
+ F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c bb99c37242673405683992085a0fcff380b70575
 -F src/select.c 36ee14d729e182cd8b6796f980b7ab3fc9bcee72
++F src/select.c 514646c18ed52f2607585e2d7361f26bc3ea460a
  F src/shell.c 6332ef06db1390ef812cfdff1fc97b4fd76cdd42
- F src/sqlite.h.in 50f83145c6543000b7d27525ecaec59a23d8280b
+ F src/sqlite.h.in 4e06cb5fed36736242c66237991db6f3e2395eb9
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
 -F src/sqliteInt.h 5afc6e50402be1e0a870f28e1cd8b32eb9db590f
 +F src/sqliteInt.h b108aac991a28e4208f526df54f82995316c56ee
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -403,11 -403,11 +403,11 @@@ F src/update.c eb7ab3ff2928628692a4f14b
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c 5048103aa6bc9c01bf1a4620729256d1e873bb6c
 -F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
 -F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b
 +F src/vdbe.c 1704a79d60f9c316adac0cbce09cae1ffc4b6af8
 +F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
 +F src/vdbeInt.h c1508eb4ee04d4db7bdfca5620cfa8ad632fdd62
- F src/vdbeapi.c 0d890f57caf143b114a95ce699e59af51359c508
+ F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649
 +F src/vdbeaux.c 7dccd114c9ee5f801709daecee36464fe6ce71af
  F src/vdbeblob.c 1d7b97115e7bbac4c318db416d2ca83fc779544a
  F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
  F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
@@@ -417,9 -417,9 +417,9 @@@ F src/vxworks.h c18586c8edc1bddbc15c004
  F src/wal.c 18b0ed49830cf04fe2d68224b41838a73ac6cd24
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
- F src/where.c c03895cdb2624a07e75c95c6889a32a15929a27a
 -F src/where.c d5eed2584542e7f3bc78ddef7809a9d76d14d811
++F src/where.c edcaa18b274526a2a74519d5b38ca6845b24dfc2
  F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
- F src/wherecode.c c80f4c7866f78b298b81fdda60006d31125b6f68
 -F src/wherecode.c 7660e1ad16817a921b099af553f3e1349352d16f
++F src/wherecode.c 16f0d8b39ecf70c10b3c9af40b1fd679cdb4e811
  F src/whereexpr.c 2473e4350e30f9b55d1c6a8f66ca23c689f23f1d
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@@ -1388,7 -1388,7 +1389,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 25ee3000e94d60d8c1d7b980f416dcc33eb11105 1d018c35b9e81982df036f5e62a4a42219b54e02
- R 094d10cbcbe8f2ec763e09bd3b0c23d3
 -P c2fcb03299f2872d7f97a540ea145519f8b2e5cc
 -R 48a05a5fcfc27e989d0482f8603455ad
++P 66fe06832614010d3156d7b21a760af9957018cc c6ab807b72ddfc1462f61aa91442b6fac04ace8a
++R 645294bb497caea763068fb2d987fbfc
  U drh
- Z 515bf273b300e1c6b0d004e464776ff6
 -Z 5529d899992d962be9e3269522b69c12
++Z e6351460f21c4d00d95c8fbc91fe5568

diff --cc manifest.uuid
index 3cab444f7e456eeeda1e125d74f1337de7645b86,8b729d01057956f78a2459a7938f39d39643f4c2..1d4e637caa31421499a40dcc0ffee5acf0e82139
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 66fe06832614010d3156d7b21a760af9957018cc
 -c6ab807b72ddfc1462f61aa91442b6fac04ace8a
++fbe637620fb7f2c9395c9ddac77d26746d6d4178

diff --cc src/btree.c
Simple merge

diff --cc src/select.c
Simple merge

diff --cc src/where.c
Simple merge

diff --cc src/wherecode.c
Simple merge