Merge the latest trunk enhancements, and especially the fix for the infinite

loop on a DROP TABLE in a corrupt database, into the apple-osx branch.

FossilOrigin-Name: 4d42bf5e18485be302cf5a3f81d900d7921b4315

diff --cc manifest
index 095dc2a0983f5dbbae0de432704d2e0a06556bd5,830165f1d1234912943d4ba3c1e07a7bf3d5b0b8..a7c001f686aae16b084dee0a419b8139ebffaae0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sapple-osx\sbranch.
- D 2015-03-24T18:49:59.439
 -C Prevent\sa\spossible\sinfinite\sloop\swhen\strying\sto\sDROP\sa\stable\sfrom\na\scorrupt\sdatabase.
 -D 2015-03-30T23:43:56.191
++C Merge\sthe\slatest\strunk\senhancements,\sand\sespecially\sthe\sfix\sfor\sthe\sinfinite\nloop\son\sa\sDROP\sTABLE\sin\sa\scorrupt\sdatabase,\sinto\sthe\sapple-osx\sbranch.
++D 2015-03-30T23:52:57.709
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 +F Makefile.in e1da335f215ba86fe687f4d963a45156f3da603e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc cd626b52ebeec0e2c0dd929243bdd25b0df19a71
+ F Makefile.msc 23e6eaa84569829c3e7f409513caa136e5bcaf2a
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
@@@ -176,7 -173,7 +176,7 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
- F src/btree.c 13590ad35778d9bcd17644956003f849f95ed745
 -F src/btree.c e565971caa0265d3cabc8b15d7017899a7814051
++F src/btree.c 24cc28c8a1508f8650d4f0da75977dbb5884d07b
  F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
  F src/btreeInt.h 2bfefc01875d8da066504c233ec259fcb3b2ef72
  F src/build.c 0419bba592c22f6d00e6d57a2ca7136720d02c1a
@@@ -195,11 -192,11 +195,11 @@@ F src/hash.h c8f3c31722cf3277d037139097
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 5b9243a33726008cc4132897d2be371db12a13be
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
  F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
- F src/main.c f327b9978cae73f09eab089f878cf9e300cf9a41
- F src/malloc.c e818a0db9ac0898f9dc74002f3a5baca32232d05
 -F src/main.c 40e333960d53f7d50ee8ce09d40431c87ea653f2
++F src/main.c a5e55e2b1849352de79260ad277f8ffeb0c4b76e
+ F src/malloc.c 6a370b83d54e4bbf6f94021221c2a311cff26a18
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
  F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@@ -217,11 -214,11 +217,11 @@@ F src/os.c 5822c2b843a77219bba1e28887cd
  F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 -F src/os_unix.c a4dadbc2da41599e99093e91e276c38c17a73b89
 -F src/os_win.c 865ba15878eded98bb29a97ac898f2a799dc481a
 +F src/os_unix.c 895648d4453400e599aa13f5547b96931264ac84
- F src/os_win.c 1d1ef630b3e3859b7399952909e10d3a4d43fc77
++F src/os_win.c c93a12edf5384bde1fa3c0a8bf9b3f58ca87d098
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c
 -F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77
 +F src/pager.c 694caffb16891a96608193968d7c9a8fa9a71240
 +F src/pager.h 5ead19acf64a16b7b663476bd36c60d26f03a696
  F src/parse.y 1299c66e7b1707322ccd8af43a359b8fb0d46d72
  F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4
  F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8
@@@ -233,13 -230,12 +233,13 @@@ F src/printf.c 8da9a2687a396daa19860f4d
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
 -F src/select.c 72ffb62e2879956302140e9f6e6ae88aee36b0e5
 +F src/select.c ca8b52422e9c525ab62304526aee4b7b15df8795
- F src/shell.c 3ae1e53878d2804fe77b8c8f1f6ca287a0e5d80e
- F src/sqlite.h.in 4f924944f132fb5554e5a247060ccd5729455b62
+ F src/shell.c 84a1593bd86aaa14f4da8a8f9b16fbc239d262aa
 -F src/sqlite.h.in 278602140d49575e8708e643161f4263e428a02a
++F src/sqlite.h.in 1d97dd551627efe9284ec65251cbf862fcb1a96d
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h e3d6df1934321a4f6778076215ff62f78c371018
 -F src/sqliteInt.h d02d2b85cb02a38bc442cf9302ec8209baf6771d
++F src/sqliteInt.h f0fb2d8e3b297b2a75c6b0e11defb036a04c27ff
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -388,9 -384,10 +388,10 @@@ F test/boundary3.test 56ef82096b4329aca
  F test/boundary4.tcl 0bb4b1a94f4fc5ae59b79b9a2b7a140c405e2983
  F test/boundary4.test 89e02fa66397b8a325d5eb102b5806f961f8ec4b
  F test/btree01.test e08b3613540145b353f20c81cb18ead54ff12e0f
+ F test/btree02.test fe69453d474d8154d19b904157ff1db4812fed99
  F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3
  F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0
 -F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de
 +F test/cache.test 0bc2195f4a7207108af2617ed356e77daf4412f7
  F test/capi2.test 011c16da245fdc0106a2785035de6b242c05e738
  F test/capi3.test bf6f0308bbbba1e770dac13aa08e5c2ac61c7324
  F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
@@@ -1217,9 -1214,9 +1219,9 @@@ F tool/mkkeywordhash.c dfff09dbbfaf950e
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
  F tool/mkpragmatab.tcl 94f196c9961e0ca3513e29f57125a3197808be2d
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
- F tool/mksqlite3c-noext.tcl 9ef48e1748dce7b844f67e2450ff9dfeb0fb4ab5
- F tool/mksqlite3c.tcl c684fc94a977e5b64fa85b831ea23d2b6e5f535f
- F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
+ F tool/mksqlite3c-noext.tcl 69bae8ce4aa52d2ff82d4a8a856bf283ec035b2e
 -F tool/mksqlite3c.tcl 52a3352f7aa15f1db851e45ac3a5e2173d6fe93c
++F tool/mksqlite3c.tcl 47a4ff09831066e5f0f1bf7db6b9e900ad7c4a84
+ F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1251,7 -1248,7 +1253,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 9f1f8b331e05d88052e6fb6556a88591efaa44bf 436314b5728c9413f9ac2d837e1c19364f31be72
- R 6a40cc3f4e2d4b303110c9f5312a11bc
 -P ab5800291e1908b5b51d912feeacf748dc9be14b
 -R 7b7ce803eb05ad2f210c6eb94fdd8e1c
++P a2bd81e575321e23f08d8dc56d4682adb44a513b 395bb3e677a6551b06ba96fc58c393132b93d1e8
++R b8de4eeddf9736bf1b0c979bad0cb527
  U drh
- Z bea17ae22d7d9444e0bc1c71a1dd6120
 -Z 53c46ef4969a0037acc3578044ba6e9e
++Z 14259944a639eb4c04d55ec65a29a73e

diff --cc manifest.uuid
index cfa397fe6b23dde826106b8d192be0079f9310e4,b562506b7fa2c39883f0af6b8648e8df5d7300c9..edaf672ac8a64eb399aefaff1a75f4d967fe006d
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a2bd81e575321e23f08d8dc56d4682adb44a513b
 -395bb3e677a6551b06ba96fc58c393132b93d1e8
++4d42bf5e18485be302cf5a3f81d900d7921b4315

diff --cc src/btree.c
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/os_win.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc tool/mksqlite3c.tcl
Simple merge