Add the BTREE_FORDELETE and BTREE_AUXDELETE flags to the b-tree layer interface

and use them.  Add assert() statement to verify that they are correct.

FossilOrigin-Name: 85c467041c9378cae3038756da815e9117ee8c7d

diff --cc manifest
index d6048a60fec58616a961e03beecdac42ff69f05b,37c3e40cf66665bbe64b275c0534f01df9f9a83a..ee7ea0da288569d7e0673bd1f66f251d5159c118
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Simplification\sand\ssize\sreduction\sto\sthe\sprintf\slogic.\s\sRemove\sthe\sbFlags\nparameter\sfrom\ssqlite3VXPrintf()\sand\ssqlite3XPrintf().\s\sUse\ssqlite3XPrintf()\ninstead\sof\ssqlite3_snprintf()\sfor\srendering\sP4\svalues\sin\sEXPLAIN\soutput.
- D 2016-01-30T12:50:25.204
 -C Improvements\sto\sFORDELETE\sprocessing,\sincluding\sbug\sfixes\sand\sadding\nassert()\sstatements\sto\shelp\sverify\scorrect\soperation.
 -D 2016-01-29T19:04:11.541
++C Add\sthe\sBTREE_FORDELETE\sand\sBTREE_AUXDELETE\sflags\sto\sthe\sb-tree\slayer\sinterface\nand\suse\sthem.\s\sAdd\sassert()\sstatement\sto\sverify\sthat\sthey\sare\scorrect.
++D 2016-01-30T13:32:30.291
  F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 6fca5455aaecbd14479f33f091aa19df2d3d2969
 +F Makefile.msc 72b7858f02017611c3ac1ddc965251017fed0845
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -290,10 -290,10 +290,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 2869a76c03eb393ee795416e2387005553df72bc
  F src/bitvec.c 1a78d450a17c5016710eec900bedfc5729bf9bdf
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 5e3435a31afbe9d839c5ee2630b8390712847415
- F src/btree.h 526137361963e746949ab966a910c7f455ac6b04
 -F src/btree.c 16edaf415a54a2fc9058e3bc47d0c894cd59635e
++F src/btree.c e3929afb9bfbaa6b39685b5e5a207036ac862a75
+ F src/btree.h 368ceeb4bd9312dc8df2ffd64b4b7dbcf4db5f8e
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
 -F src/build.c b4eba1e84752ec9cae7ff3dacd5a8b6d1ab8deb9
 +F src/build.c 0510844c48d80732aead74b5727403b493dd1cd5
  F src/callback.c 29ae4faba226c7ebb9aee93016b5ce8a8f071261
  F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
@@@ -352,7 -352,7 +352,7 @@@ F src/shell.c dcd7a83645ef2a58ee9c6d0ea
  F src/sqlite.h.in 214476a62012e578f42133a9a3b4f97a9aa421a3
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 5b552cc0eee50d519e2e020f16abbc68947b0e59
 -F src/sqliteInt.h 12ec54454fc0f1c25f5c7057423ada1a363b6db0
++F src/sqliteInt.h 2f80b9b1506a8d602b2a99f3f0bfae22df3e7d70
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -412,15 -412,15 +412,15 @@@ F src/update.c 17332f9fe818cbc0444c36a8
  F src/utf.c 32d7f82aa921322f3e1c956f4b58f019ebd2c6b3
  F src/util.c 72d40df0a52d3f30b462a15f0e094fcbade6dc82
  F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
- F src/vdbe.c 0686ef5ee103935548d1aa2c0c28e52f1ae6e5a8
 -F src/vdbe.c e86e100a3f90a861f28a5bda9c9abf1bca119a54
++F src/vdbe.c d9d2406d8a3baca537d2b05a2354afaa25e1ca84
  F src/vdbe.h 7a733ea8aac1b77305a67698e784fa3484ee3337
- F src/vdbeInt.h 171fdc5f6af4eeb0ff0559dbf0a71244d726a670
 -F src/vdbeInt.h 40c728712a2975855a2ac6aac44bf02dfd4a4c30
++F src/vdbeInt.h 716df83ac45b70ff000b515040ea606d0cb5d0f3
  F src/vdbeapi.c ffae8f5af4570fbd548504e815e9fb7227f0822e
 -F src/vdbeaux.c 757f86e6fef8efb3dd4226cb31e2e82b9c44c883
 +F src/vdbeaux.c 221631e40111b5efa96ea557c6e2e7f62fd32b2a
  F src/vdbeblob.c 37c3d11a753e403698c69e17383d282e1ae73e75
  F src/vdbemem.c b9181e77eca2a095929d46250daf85c8d2621fc0
 -F src/vdbesort.c 3bb1f1f03162e6d223da623714d8e93fcaeac658
 -F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
 +F src/vdbesort.c ef3c6d1f1a7d44cf67bb2bee59ea3d1fe5bad174
 +F src/vdbetrace.c f75c5455d8cf389ef86a8bfdfd3177e0e3692484
  F src/vtab.c 320682cca733115b4cbe71320b5c5eeb1074ebde
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
  F src/wal.c d21b99fd1458159d0b1ecdccc8ee6ada4fdc4c54
@@@ -1422,7 -1422,8 +1422,8 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 9de3d7123007636aa97da1c70bc34344b0391078
- R 821c09620afbfbde9b9d6d9359867747
 -P 9a71d56dcea953cb965f1fdda9a8b8f158cdeff6 10c88bf9f2c238abbbb54797ee2327ab72713e6f
 -R 4fbaa01893d53f4580e8296002d14aff
 -T +closed 10c88bf9f2c238abbbb54797ee2327ab72713e6f
++P 0bdb41c45aa1cc8e5c136aaa6605d54b401483bd 46080b0474363ca6594d2e5c249a280e2b4fc67a
++R 54437ffc6525e4a6d93d7714d1fd6e2f
++T +closed 46080b0474363ca6594d2e5c249a280e2b4fc67a
  U drh
- Z e57134af984dbdd8b3338eb2a295687a
 -Z 91aa530fa68de069219425c1000f2200
++Z 640a4b96ac8cc992fda6dcd328c886fd

diff --cc manifest.uuid
index 0454e6289a6d6acd9f48a45c31b97f63026f3bf4,8118d1e7058e87dec8b6f9095033ebcb6564057d..32d73b494555c25ee58df5fd4e548c9c91f998d7
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0bdb41c45aa1cc8e5c136aaa6605d54b401483bd
 -46080b0474363ca6594d2e5c249a280e2b4fc67a
++85c467041c9378cae3038756da815e9117ee8c7d

diff --cc src/btree.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge

diff --cc src/vdbeInt.h
Simple merge