Merge in all the other ROLLBACK fixes from the branch-3.8.7 branch.

I don't know why I was doing them one-by-one.

FossilOrigin-Name: 296b0c7397790ceadbdb330959e962f6491abc3e

diff --cc manifest
index 9cb41e8715520ea487646c35ef2c35c105f81ccf,00bcf54505833becb3e9af71fb1272105b3bb745..8a5349a2dde39e9185914f51df77471625b9b0b3
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Fix\sa\sbug\sin\sthe\ssqlite3TripAllCursors()\sroutine\sthat\sprevents\sit\sfrom\nreporting\serrors.\s\sIt\sis\sunknown\sat\sthis\stime\swhether\sor\snot\sthis\somission\scan\nresult\sin\sany\sincorrect\sresult\sin\san\sactual\squery.
- D 2014-11-18T20:22:05.030
 -C Increment\sthe\sversion\snumber\sto\s3.8.7.2
 -D 2014-11-18T12:28:52.482
++C Merge\sin\sall\sthe\sother\sROLLBACK\sfixes\sfrom\sthe\sbranch-3.8.7\sbranch.\s\s\nI\sdon't\sknow\swhy\sI\swas\sdoing\sthem\sone-by-one.
++D 2014-11-18T20:49:30.759
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 +F Makefile.in a226317fdf3f4c895fb3cfedc355b4d0868ce1fb
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec
 +F Makefile.msc 788f1288633a0c3c3cbbe0f3e4827d033f7ba530
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
 -F VERSION 3978bf46d1599bc324ae171a99c4e8fca7481822
 +F VERSION d846487aff892625eb8e75960234e7285f0462fe
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -164,25 -163,25 +164,25 @@@ F mptest/mptest.c 499a74af4be293b7c1c7c
  F mptest/multiwrite01.test 499ad0310da8dff8e8f98d2e272fc2a8aa741b2e
  F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 -F sqlite3.1 3d8b83c91651f53472ca17599dae3457b8b89494
 +F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
  F src/alter.c ba266a779bc7ce10e52e59e7d3dc79fa342e8fdb
 -F src/analyze.c 8c322e1ecc08909526dbd5ab4421889d05f2263d
 +F src/analyze.c afbcca663c3f3625340b8e30d440cd7a97ded6bc
  F src/attach.c f4e94df2d1826feda65eb0939f7f6f5f923a0ad9
 -F src/auth.c d8abcde53426275dab6243b441256fcd8ccbebb2
 -F src/backup.c 8cdfeb0c8a6d8bdad3faefae418eb3dc767051b6
 +F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 +F src/backup.c 7ddee9c7d505e07e959a575b18498f17c71e53ea
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c 75edb585cc2c66615e0ea01a48807a7bfae4f2fe
 -F src/btree.c c961588f01bd95d37b90359220c640f9763a3f58
 -F src/btree.h a4afc6b06f5a1dd2076d15aa168baec44fc0121b
++F src/btree.c b562da29eb370aaac8015026827c2e2fb70ae990
 +F src/btree.h e31a3a3ebdedb1caf9bda3ad5dbab3db9b780f6e
- F src/btreeInt.h 026d0129724e8f265fdc60d44ec240cf5a4e6179
+ F src/btreeInt.h 3363e18fd76f69a27a870b25221b2345b3fd4d21
 -F src/build.c 9dc2bd94347b878c89627000c92b0c8d97ec2919
 +F src/build.c 67bb05b1077e0cdaccb2e36bfcbe7a5df9ed31e8
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
 -F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
 -F src/ctime.c bb434068b5308a857b181c2d204a320ff0d6c638
 -F src/date.c 57a7f9ba9f6b4d5268f5e411739066a611f99036
 +F src/complete.c c4ba6e0626bb94bc77a0861735f3382fcf7cc818
 +F src/ctime.c df19848891c8a553c80e6f5a035e768280952d1a
 +F src/date.c 93594514aae68de117ca4a2a0d6cc63eddf26744
  F src/delete.c 0750b1eb4d96cd3fb2c798599a3a7c85e92f1417
 -F src/expr.c 1891cb50510a31e96de8a54579e7d3aef60f0094
 +F src/expr.c a3ff05db5709d628c23890db862e30f3dd9dc428
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
  F src/func.c ba47c1671ab3cfdafa6e9d6ee490939ea578adee
@@@ -289,23 -287,23 +289,23 @@@ F src/tokenize.c cc9016e5007fc5e7678907
  F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
  F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
 -F src/util.c 4006c01772bd8d8ac4306d523bbcee41d3e392d8
 -F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
 -F src/vdbe.c 8bc291aa00646d07dab33047520960ea454c5a2f
 -F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
 -F src/vdbeInt.h e2a060a55ee18a6ab973353a5e2ec7ee569bf787
 -F src/vdbeapi.c 37a6c6ae284a97bcace365f2f0a225680c0499d9
 -F src/vdbeaux.c edbb7a9c8b2a8f7a68ac75c2475edd4040266b76
 -F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
 +F src/util.c 3b627daa45c7308c1e36e3dbaa3f9ce7e5c7fa73
 +F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
- F src/vdbe.c 5d3991d723f00ef86263f4d494e105faba5a5abd
++F src/vdbe.c 5563459c06c434bc43131044fcf8164654008ebd
 +F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
 +F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
 +F src/vdbeapi.c 07acb615d1e4170e71fc1b0d087f3c53a1ad8e83
 +F src/vdbeaux.c 9b0a251b6dfab349dd6c6efb40062eb7386b26f5
 +F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
  F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
 -F src/vdbesort.c 975aeffa99acb0991b2f288d30294756bff41438
 +F src/vdbesort.c 87f3923483113d1c95d84640becb4e4946f27d9a
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
 -F src/vtab.c cb0c194303fea276b48d7d4b6d970b5a96bde8de
 -F src/wal.c 095d41f7114d7a8699207f5313488aa88372d540
 +F src/vtab.c 2a30791bbd7926b589401bd09c3abb33de563793
 +F src/wal.c fa090966140602f03a621f87d82ee69e66ca63b5
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
 -F src/where.c 2947912f1f3d6a7766fe087fd532a5d688d745b1
 -F src/whereInt.h 124d970450955a6982e174b07c320ae6d62a595c
 +F src/where.c 3862a1173ae2716bde12f1ab3fb649f1d85b05c2
 +F src/whereInt.h d3633e9b592103241b74b0ec76185f3e5b8b62e0
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7
@@@ -810,8 -797,7 +810,8 @@@ F test/savepoint3.test e328085853b14898
  F test/savepoint4.test c8f8159ade6d2acd9128be61e1230f1c1edc6cc0
  F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
  F test/savepoint6.test f41279c5e137139fa5c21485773332c7adb98cd7
- F test/savepoint7.test 1c8f26b1e2a4221b0214e222ce12a97a59918eb2
+ F test/savepoint7.test db3db281486c925095f305aad09fe806e5188ff3
 +F test/scanstatus.test a6dd739bc4d9638e8f5c2493b518057f2b681655
  F test/schema.test 8f7999be894260f151adf15c2c7540f1c6d6a481
  F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
  F test/schema3.test 1bc1008e1f8cb5654b248c55f27249366eb7ed38
@@@ -1221,8 -1205,7 +1221,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 abccda769a3f6b755c3bf70b5fb31a5e16718ef3
- Q +42588207ff5451cb785c394633e1ab631fb82f01
- R be8390e45e84a659cdb889947026b04a
 -P c5eae8a60d474131fbfa4d0c2b459005267e8be4
 -R 876a331fea8d7e2c7f47a110195c3ecb
++P 2896f2640ab3e102ee248d20fb68c497817524eb 945a9e687fdfee5f7103d85d131024e85d594ac3
++R 8b4c6ed5b267d5d2bc5845aacffad250
  U drh
- Z 45d41fa50f6cb7c97c28d0b284fe4014
 -Z 48596521afe0080c14cc5d1c64dcfe43
++Z 0fc13d2fc810c826601883122c184fdf

diff --cc manifest.uuid
index 922bec9a781b0e6dcd60aaa070900fc2345ed915,a62a0bd66140c03043ae01ab03e4fee8b505dcce..75b72440d459aa0d7816e6cbc765e97ccde46562
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2896f2640ab3e102ee248d20fb68c497817524eb
 -945a9e687fdfee5f7103d85d131024e85d594ac3
++296b0c7397790ceadbdb330959e962f6491abc3e

diff --cc src/btree.c
Simple merge

diff --cc src/vdbe.c
Simple merge