Merge recent changes from trunk. Also remove unused variables to permit

compiling with -Werror.

FossilOrigin-Name: 57b700baa690f73894cd53b8e87839760fe4019b

diff --cc manifest
index d72d370260af01a3bb1c4251ebebfebc67511c1d,8ac154c64cb1618f5e6ef899d82ffe52c6629afb..c2701fc81c9b927260d044c929347ea898182f34
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sextra\stest\scases\sto\sdelete4.test.
- D 2015-12-09T17:45:58.308
 -C Simplified\salignment\sconstraints\sin\sthe\smemory\sreuse\slogic\sof\nsqlite3VdbeMakeReady().
 -D 2015-12-11T13:51:02.921
++C Merge\srecent\schanges\sfrom\strunk.\s\sAlso\sremove\sunused\svariables\sto\spermit\ncompiling\swith\s-Werror.
++D 2015-12-11T13:59:45.914
  F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc e8fdca1cb89a1b58b5f4d3a130ea9a3d28cb314d
@@@ -291,7 -291,7 +291,7 @@@ F src/complete.c addcd8160b081131005d5b
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
  F src/date.c fb1c99172017dcc8e237339132c91a21a0788584
  F src/dbstat.c ffd63fc8ba7541476ced189b95e95d7f2bc63f78
- F src/delete.c 5f5bd96158929acc5f9c74fa928ee7d8a6b73f0b
 -F src/delete.c 00af9f08a15ddc5cba5962d3d3e5bf2d67b2e7da
++F src/delete.c 93f68145ac74fd8f7849175e09db4fd70e96b03d
  F src/expr.c ccb93d7b7e1ac5d187c9b153bae145933f93ee5c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 31900763094a3736a5fc887469202eb579fef2d0
@@@ -341,10 -341,10 +341,10 @@@ F src/resolve.c a83b41104e6ff69855d03cd
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c f8fded11fc443a9f5a73cc5db069d06b34460e2f
  F src/shell.c abbc74ea43dbf2f306ea18282d666683fb5efab2
- F src/sqlite.h.in 1248a78548024bdc8ef5893faa0ff9552b4cceb4
+ F src/sqlite.h.in 7d87d71b9a4689c51fa092f48f16590ff71558e3
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h e638ac9057713c6654eb34398faddf2a885668ef
 -F src/sqliteInt.h beb4a63b94428f52a3d7c7af2ba8bdc7d4682a03
++F src/sqliteInt.h e93e14407ef5ad4b8eabd7b9a765cfb190722ffb
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -415,10 -415,10 +415,10 @@@ F src/vdbesort.c a7ec02da4494c59dfd0711
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
- F src/wal.c 1569802364cd192bbd5c4a8ea3fd6de593edecbd
- F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
+ F src/wal.c cb709aa42fc11b1ea92a00c8c7e6214de0995fa3
+ F src/wal.h 907943dfdef10b583e81906679a347e0ec6f1b1b
  F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba
 -F src/where.c b18edbb9e5afabb77f4f27550c471c5c824e0fe7
 +F src/where.c b3b70c8e0f02a4f5f0722322615d93e3f9fb337b
  F src/whereInt.h e20801d89e34de1912bb6a3babb30c390da27add
  F src/wherecode.c dfbfe198e418b01f208b489e088edd230c91a4e7
  F src/whereexpr.c eebba8340c90de73b3d3bbe8c43b84559b8e6e2c
@@@ -1408,7 -1410,7 +1410,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 c80bbf14b365d2131210a849f26a69a5ea15101d
- R fe254f2ce86170e9ef3cfc20b10d1bdc
- U dan
- Z 9a61083e3852e4abddb9cdf1dba864e8
 -P 9b124a5a310aec0145495c9980bc0c1308fcca02
 -R 8b7bf5c5d9b6c5d6524021fe34935458
++P 571b64b923c82060f34bf6baa21d72d2a9797e6f e998513e442ce1206b12dc28bdc996d7b5f9f94d
++R 7e34dbe155ea9f60691f4ae03f3a719a
+ U drh
 -Z 8b682652b257be08de396beec767150c
++Z abb81097f04b710d8fe83482078029c5

diff --cc manifest.uuid
index e42e00544d0f870c93e27a659fa9f93c05197a9c,8c6ba19c4c6d4f08bb185c76ee94272d3f190c2e..c79ee70735d0bd4f7926e519590bd4f2e7f28cbd
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 571b64b923c82060f34bf6baa21d72d2a9797e6f
 -e998513e442ce1206b12dc28bdc996d7b5f9f94d
++57b700baa690f73894cd53b8e87839760fe4019b

diff --cc src/delete.c
index 3999ec38ab6ea9bb374921513bd5a738627409ad,ed273bde81aab798020206a4b7445ce3fbe7d1f5..fab38eed7eaa59e702a2bd4b384c934bc2524521
--- 1/src/delete.c
--- 2/src/delete.c
+++ b/src/delete.c
@@@ -530,12 -223,14 +530,9 @@@ void sqlite3DeleteFrom
    Vdbe *v;               /* The virtual database engine */
    Table *pTab;           /* The table from which records will be deleted */
    const char *zDb;       /* Name of database holding pTab */
--  int i;                 /* Loop counter */
 -  WhereInfo *pWInfo;     /* Information about the WHERE clause */
    Index *pIdx;           /* For looping over indices of the table */
    int iTabCur;           /* Cursor number for the table */
--  int iDataCur = 0;      /* VDBE cursor for the canonical data source */
--  int iIdxCur = 0;       /* Cursor number of the first index */
    int nIdx;              /* Number of indices */
 -  sqlite3 *db;           /* Main database structure */
    AuthContext sContext;  /* Authorization context */
    NameContext sNC;       /* Name context to resolve expressions in */
    int iDb;               /* Database number */
@@@ -628,7 -336,7 +625,6 @@@
  #if !defined(SQLITE_OMIT_VIEW) && !defined(SQLITE_OMIT_TRIGGER)
    if( isView ){
      sqlite3MaterializeView(pParse, pTab, pWhere, iTabCur);
--    iDataCur = iIdxCur = iTabCur;
    }
  #endif
  

diff --cc src/sqliteInt.h
Simple merge