Merge recent enhancements and bug fixes from trunk.

FossilOrigin-Name: 78bc42e664e9fa9ee21ad9762c369f291fcdf5db

diff --cc Makefile.in
Simple merge

diff --cc ext/fts5/fts5_main.c
index bd004cf824008a028c76f3eeb3391f70589bfb78,ee5adc4b980e0d5735550402155ebc07861b95fd..9390cb6cb288586f5e6c511e1686192042d0680e
--- 1/ext/fts5/fts5_main.c
--- 2/ext/fts5/fts5_main.c
+++ b/ext/fts5/fts5_main.c
@@@ -835,7 -874,7 +874,6 @@@ static int fts5CursorFirstSorted(Fts5Ta
    int nPhrase;
    int nByte;
    int rc = SQLITE_OK;
--  char *zSql;
    const char *zRank = pCsr->zRank;
    const char *zRankArgs = pCsr->zRankArgs;
    

diff --cc main.mk
Simple merge

diff --cc manifest
index 2d04d10a2340e6081c06b5ddff92865f6f4f9bf0,782863019bb33593fb7e64a060590d88227d68bb..701f0d01fcfab02d1f75f4f76ff08bdd186c3e08
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sall\srecent\senhancements\sand\sfixes\sfrom\strunk.
- D 2015-11-02T18:57:26.691
- F Makefile.in 3229179cfbc7d1378aba248dcbdf5213fff6214a
 -C The\sOPFLAG_SEEKEQ\soptimization\sis\sonly\sapplicable\sto\sequality\scomparisons\nagainst\san\sindex,\snot\sagainst\sa\srowid\stable.
 -D 2015-11-07T01:19:00.997
 -F Makefile.in 3a705bb4bd12e194212ddbdbf068310d17153cdb
++C Merge\srecent\senhancements\sand\sbug\sfixes\sfrom\strunk.
++D 2015-11-07T01:33:30.741
++F Makefile.in 7037017983949da7c736ca3de2c3d29611b77d1c
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
 +F Makefile.msc 2ed14817d36a6c26cb146e53b9c8a7318ba5bdd4
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 8b9d3ac6f1962f94e06ba05462422a544f9c4e36
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -103,14 -103,14 +103,14 @@@ F ext/fts3/unicode/mkunicode.tcl 95cf7e
  F ext/fts3/unicode/parseunicode.tcl da577d1384810fb4e2b209bf3313074353193e95
  F ext/fts5/extract_api_docs.tcl a36e54ec777172ddd3f9a88daf593b00848368e0
  F ext/fts5/fts5.h 8b9a13b309b180e9fb88ea5666c0d8d73c6102d9
- F ext/fts5/fts5Int.h 06594fd3e5a3c74da6df9141e165975dc0ea6ef4
+ F ext/fts5/fts5Int.h acf968e43d57b6b1caf7554d34ec35d6ed3b4fe8
  F ext/fts5/fts5_aux.c 1f384972d606375b8fa078319f25ab4b5feb1b35
  F ext/fts5/fts5_buffer.c 1e49512a535045e621246dc7f4f65f3593fa0fc2
- F ext/fts5/fts5_config.c 88a77f5d5e4dfbb2355b8f6cc9969b7f02d94685
+ F ext/fts5/fts5_config.c 6fc92c0b1bda5244c28a54c9ba740736bd5513d9
  F ext/fts5/fts5_expr.c 28b15c9ae296204bc0a2e5cf7a667d840a9d2900
  F ext/fts5/fts5_hash.c a9d4c1efebc2a91d26ad7ebdfcbf2678ceac405f
- F ext/fts5/fts5_index.c 356481ce027cc2ede8e462c316b578260cda29d2
- F ext/fts5/fts5_main.c 39358d3d8f0d6ea3757c40e0ddcbb6bc435604c3
+ F ext/fts5/fts5_index.c b622a0a70f57a96469e6828da2dd70e0872aeb37
 -F ext/fts5/fts5_main.c 0569cd9fc18f3b56f6eeac601836df8ed5fb54cb
++F ext/fts5/fts5_main.c 7581280ee242785477df67402f2853c66f77d45b
  F ext/fts5/fts5_storage.c 9ea3d92178743758b6c54d9fe8836bbbdcc92e3b
  F ext/fts5/fts5_tcl.c 3bf445e66de32137d4693694ff7b1fd6074e32bd
  F ext/fts5/fts5_test_mi.c e96be827aa8f571031e65e481251dc1981d608bf
@@@ -283,7 -263,7 +283,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48
  F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
  F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
  F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
- F main.mk ace127ebc8f73fbe37ecf9021385f9efdc4d595d
 -F main.mk ac9746f24334056c85775dbe6b7279b84a6941d7
++F main.mk 2e67604b0dbd7670230ed626b6a2947f05a35ba5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
  F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
  F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@@ -310,8 -290,8 +310,8 @@@ F src/callback.c 7b44ce59674338ad48b0e8
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 509ef9c64d1321f42448f111da86400b1799218a
  F src/date.c fb1c99172017dcc8e237339132c91a21a0788584
- F src/dbstat.c e637e7a7ff40ef32132a418c6fdf1cfb63aa27c7
+ F src/dbstat.c ffd63fc8ba7541476ced189b95e95d7f2bc63f78
 -F src/delete.c c4c6fb9da78b946fcba2a6aac5b24bc5c15e752a
 +F src/delete.c 9dddc4434aace0f42f1ed1c5224cdcfc2328ed67
  F src/expr.c 0080c0f12806eca91e75a23a121a68918e9da357
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 31900763094a3736a5fc887469202eb579fef2d0
@@@ -361,17 -341,17 +361,17 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 167b4e9058bc8e997d18d6b6b20ecbb0c9c457af
 -F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
 -F src/sqlite.h.in 3cfc86c55e57c63d86b9e1e92869e2bfb162ca8e
 +F src/shell.c 993863f82d764be0c00803056e56b9b744f86f02
 +F src/sqlite.h.in 45821b35edf55ac410c16a3e1de4d6d43aa7ee16
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
- F src/sqliteInt.h b2e72eaa886665d042908a736d98fadacab95ef6
 -F src/sqliteInt.h 12ff325b433c4ded39995b74b01b78aacc19805a
++F src/sqliteInt.h a02b33a3b68913394c218ec27f24b8fa33518244
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
 -F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
 +F src/tclsqlite.c e2344bee0d192397f555a24ef3fab26f2ed93bcc
- F src/test1.c 9ac5cbfe3c859ab7518edc5109a2959d6bf7b059
- F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
+ F src/test1.c a719afff3144f7f01c6dc3f7d118ac31d15e7527
+ F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
  F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
  F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
  F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
@@@ -423,13 -403,13 +423,13 @@@ F src/update.c c2fff3b60bfcabcb0372acbe
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 755ebcef6b85f4917b567401752aa39523cd06e5
 -F src/vdbe.c 7a9b18027414368d800716e6319e2acd699c70db
 -F src/vdbe.h efb7a8c1459e31f3ea4377824c6a7e4cb5068637
 -F src/vdbeInt.h 33403622c6a8feaaac5f0f3f17f5d1bf6df42286
 -F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
 -F src/vdbeaux.c 6d55530b05b69bc663c87d2d258318dcdf042644
 -F src/vdbeblob.c 565fabd302f5fca3bdf3d56cac330483616a39b6
 -F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
++F src/vdbe.c 9539aa0ccf4844b8b59466ef3c15dbffb479a390
 +F src/vdbe.h bfe3f80dba435377cdb64fd917f2529f0f48ab77
 +F src/vdbeInt.h d6ae6e64ad16e213f37306b1735ff72fb98bec69
 +F src/vdbeapi.c f5eda36a5c85ef578957ab4311e8d9b1f51a3552
- F src/vdbeaux.c 3c67cbdee0308a0e0a942e5edea95339e021ea5c
++F src/vdbeaux.c 1c5969fa8b04e162a2e893ebb283071bec81a006
 +F src/vdbeblob.c b400c25ac822af3c507ef84b5cd93c1583a70321
 +F src/vdbemem.c 25b6cfd665b5073480452426e84136edd94140c0
  F src/vdbesort.c 8b23930a1289526f6d2a3a9f2e965bcc963e4a68
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
@@@ -783,8 -763,9 +783,9 @@@ F test/fuzzer1.test d4c52aaf3ef923da293
  F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
  F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
  F test/hexlit.test 1d312fa816dfd3650a3bb488093bc09a0c927f67
 -F test/hook.test 162d7cef7a2d2b04839fe14402934e6a1b79442f
 +F test/hook.test aa41c095d26822b8a51aa4c82904a14347961be6
  F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
+ F test/ieee754.test 118b665a97a8df0e8f2fbdb07d113e596f4a6b53
  F test/imposter1.test c3f1db2d3db2c24611a6596a3fc0ffc14f1466c8
  F test/in.test 61a24ae38d4b64ec69f06ccdf022992f68a98176
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
@@@ -948,7 -930,7 +950,7 @@@ F test/parser1.test 222b5cbf3e2e659fec1
  F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
- F test/permutations.test c57b8fa360f3b86385fc03f9b25160b5fdfbcb51
 -F test/permutations.test 4ea119731c62d2f7d0aa86dd5b184cbb61ca411b
++F test/permutations.test 63cb93f915b4056463cef8ad035082e9f1cb524e
  F test/pragma.test a44253f911e7d50127d4a08f927f47c861a4c772
  F test/pragma2.test b5e2ce4c892afceb308c6ae6163a9099b2a0d8d7
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
@@@ -1419,7 -1400,7 +1421,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 395a153ff7b3c7a72f3d02b6fe76d72383f4e480 6d5ce3ede4c7038c19a77268a5a7b9d5650933c2
- R 108cce56953c38f03dac9fc0349473c4
 -P dd9a26ecdeaef7b0b9cbf4ff70448ab13a276b4e
 -R 37fd8f25666e5cc61c467cdb94b7bb71
++P 0546d1cd1a3402890edade7970c269cc3f17bc98 0f5b147d1fe83c34d0fbeacc7422be94d8441bc1
++R 65016c2c463ac04ecdb2d993caf6bb9d
  U drh
- Z a9e0c02c1ba22a50e60adc1f82d63108
 -Z b3bf4f06c783a2156de71d3cb1963976
++Z 6ef4d8405632dbe4f4eb27a0771bc5f1

diff --cc manifest.uuid
index 1c809979a9ce75548cfb6acd5f25f8dcd8893e48,f7a057f393aabee2cf6f57abf6df920f928839ab..5e3b708e1bc91be7ba0a598079a07a6be8dbcbaa
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0546d1cd1a3402890edade7970c269cc3f17bc98
 -0f5b147d1fe83c34d0fbeacc7422be94d8441bc1
++78bc42e664e9fa9ee21ad9762c369f291fcdf5db

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeaux.c
Simple merge

diff --cc test/permutations.test
Simple merge