From: drh <drh@noemail.net>
Date: Mon, 26 Oct 2015 18:51:09 +0000 (+0000)
Subject: Merge in all trunk changes prior to the BTREE_FORDELETE enhancement.
X-Git-Tag: version-3.10.0~191^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0691191d2623f60fc465e8caf456385e71b18e86;p=thirdparty%2Fsqlite.git

Merge in all trunk changes prior to the BTREE_FORDELETE enhancement.

FossilOrigin-Name: 53d5a4add6b60722ad77daf98b6b8983b081e16a
---

0691191d2623f60fc465e8caf456385e71b18e86
diff --cc manifest
index 17763a19f4,fa40bac9a9..a66f2b7f81
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\srecent\senhancements\sfrom\strunk.\s\sVersion\snow\s3.9.1.
- D 2015-10-16T20:53:57.452
 -C Fix\sa\sC99-ism\sand\sa\sharmless\scompiler\swarning.
 -D 2015-10-26T14:54:32.296
++C Merge\sin\sall\strunk\schanges\sprior\sto\sthe\sBTREE_FORDELETE\senhancement.
++D 2015-10-26T18:51:09.614
  F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 4eb750e0fdf52050a06d881e1b060f4bb116ed7e
+ F Makefile.msc 702d3e98f3afc6587a78481257f3c4c900efc3a4
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION a47917b59f38b632b3a8662d14fd20f94956bdd0
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -280,8 -280,8 +280,8 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c c3a9c4209439b806c44cf30daf466955727bf46c
  F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 7fc9513b151e3ef30369609151a18177b0b3beda
 -F src/btree.c ea8c62f65e57e49bd6b0988cd681aca7246b51af
 -F src/btree.h 40189aefdc2b830d25c8b58fd7d56538481bfdd7
++F src/btree.c 6e7cafdb9f245e0670c3478136a3c0c39ff5cf7b
 +F src/btree.h 9cc758f0f1e0002049d9eb0232f9783f21f25ac5
  F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0
  F src/build.c d6162335d690396dfc5c4bd59e8b2b0c14ba6285
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
@@@ -290,7 -290,7 +290,7 @@@ F src/ctime.c 509ef9c64d1321f42448f111d
  F src/date.c fb1c99172017dcc8e237339132c91a21a0788584
  F src/dbstat.c e637e7a7ff40ef32132a418c6fdf1cfb63aa27c7
  F src/delete.c 35c939eb8bacc9dd8a6715964e5f69feb8c20e44
- F src/expr.c 41c83c44758eba4c2bac868090346ce69d2f2dd7
 -F src/expr.c d9896fda47a8f67d0ed203e1fa981444424200c6
++F src/expr.c ea3e0c2981ffc7bd358714fa6d5132cb2cd5fc3a
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 31900763094a3736a5fc887469202eb579fef2d0
  F src/func.c ecdd69ec6a1e406f04cc73324be2ebbf6354197f
@@@ -343,9 -343,9 +343,9 @@@ F src/shell.c d25df04168d6ba5a4fa05bdbf
  F src/sqlite.h.in 839c818e16ea68703d90d17bd2bb3607191debce
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
 -F src/sqliteInt.h 1ad779ee62efee60494af0a75d8d45592f9f53c3
 +F src/sqliteInt.h af76837cad8fb696e6527ec2745f175de7cb9093
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
- F src/status.c 286f6398a4d2cd1e8ff0771e3d30f8dddb4768ea
+ F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
  F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
  F src/test1.c 8fff9c5aa63d6490f516d018b70c12a9cb9a4d8a
@@@ -415,9 -415,9 +415,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 05a178b78c835928d7037c0b2e409b7b656a68a4
 -F src/where.c 7b9e8d72e3eb52cec98617a5d6a029191bf1bcc8
++F src/where.c 51cca249502ee71fb77b425687dac611277925b2
  F src/whereInt.h 7892bb54cf9ca0ae5c7e6094491b94c9286dc647
 -F src/wherecode.c b924b78acd9e623fb69bfa2cb65cd7d542166dd3
 +F src/wherecode.c 9aa2043685ec3eb73e87fa6f50aa4ec092f197dd
  F src/whereexpr.c e63244ca06c503e5f3c5b7f3c9aea0db826089ed
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@@ -1392,7 -1391,7 +1392,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 29444149342fc6b1ea8cd34c2c8e1fcb06eaa7ed 39e8a5d93fa370afb03223bf0c20ea0f3448b9fc
- R 65f1893d9bc2d803f33dd71113ac3287
 -P e0ce3fc089c2523b8b718b4a4f9ab8c4d0432fc7
 -R 2133c21a41df33b66ecf042f1953a26d
++P 26fa091d68e89a0b6af61ba706d23a9f37e8025a 138783b553602a055b3efdeac5947cf5ccd76b5d
++R 4b723e99df9abf57da690efface1cef0
  U drh
- Z c857f56fb460d2406ff0431b8f8cb27b
 -Z 7527955b7ce1cc200d4d1a233d6e1b75
++Z 936e93924f01554045ee6552abb7ef82
diff --cc manifest.uuid
index 26dbcd2e8d,3da3b3d71f..13182502f3
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 26fa091d68e89a0b6af61ba706d23a9f37e8025a
 -138783b553602a055b3efdeac5947cf5ccd76b5d
++53d5a4add6b60722ad77daf98b6b8983b081e16a