From: drh <drh@noemail.net>
Date: Fri, 12 Dec 2014 00:26:59 +0000 (+0000)
Subject: Merge the cell overflow page number cache thread race fix from trunk.
X-Git-Tag: version-3.8.8~92^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f5c1a0186426789eb581d2f9e18b53bf552522a;p=thirdparty%2Fsqlite.git

Merge the cell overflow page number cache thread race fix from trunk.

FossilOrigin-Name: cefad47ec2ad58d7ecd58bab9a261e4d5816cd69
---

5f5c1a0186426789eb581d2f9e18b53bf552522a
diff --cc manifest
index 9e5cb882e3,69fe030103..3dc59d55a4
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sbug\sin\sthe\sthreadtest4.c\sprogram.\s\sRemove\sthe\skeyinfo\scache\sas\sit\sprovides\nminimal\sperformance\simprovements,\sand\sthen\sonly\sat\sSQL\spreparation\stime,\snot\nat\sruntime,\sand\sit\shas\sproblems\swith\sdata\sraces\sin\sshared-cache\smode.\s\sWe\smight\nlater\sadd\sthe\skeyinfo\scache\sback\sbut\sonly\senable\sit\swhen\sshared-cache\smode\nis\soff.
- D 2014-12-12T00:20:37.023
 -C Fix\sa\srace\scondition\sto\sdo\swith\svery\slarge\sindex\skeys\sin\sshared-cache\smode.
 -D 2014-12-11T16:38:18.086
++C Merge\sthe\scell\soverflow\spage\snumber\scache\sthread\srace\sfix\sfrom\strunk.
++D 2014-12-12T00:26:59.974
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -173,10 -173,10 +173,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7
  F src/backup.c 7ddee9c7d505e07e959a575b18498f17c71e53ea
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
- F src/btree.c ea6692ce58bfba55b12c75d2947fec0906d1ef7a
+ F src/btree.c ab4b60fcf9920d862ff4d96efb1d605e4e7701a0
  F src/btree.h e31a3a3ebdedb1caf9bda3ad5dbab3db9b780f6e
  F src/btreeInt.h 3363e18fd76f69a27a870b25221b2345b3fd4d21
 -F src/build.c 67bb05b1077e0cdaccb2e36bfcbe7a5df9ed31e8
 +F src/build.c 162d84e4833b03f9d07192ef06057b0226f6e543
  F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
  F src/complete.c c4ba6e0626bb94bc77a0861735f3382fcf7cc818
  F src/ctime.c df19848891c8a553c80e6f5a035e768280952d1a
@@@ -912,8 -912,7 +912,8 @@@ F test/thread2.test f35d2106452b77523b3
  F test/thread_common.tcl 334639cadcb9f912bf82aa73f49efd5282e6cadd
  F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
  F test/threadtest2.c ace893054fa134af3fc8d6e7cfecddb8e3acefb9
- F test/threadtest3.c fca8d360b470405ae3ed431b5cb4cdf031f85a74
+ F test/threadtest3.c 2b6e07e915c383c250a5b531cf6ef163a3047d7e
 +F test/threadtest4.c 38cb574939d5e0c8bd3baa5eb45def2ac6da4db4
  F test/tkt-02a8e81d44.test 6c80d9c7514e2a42d4918bf87bf6bc54f379110c
  F test/tkt-26ff0c2d1e.test 888324e751512972c6e0d1a09df740d8f5aaf660
  F test/tkt-2a5629202f.test 0521bd25658428baa26665aa53ffed9367d33af2
@@@ -1228,7 -1228,7 +1229,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 ec3a74469ca2f0f3fb7d82a05fdac7500354e78f
- R e481d4adf19d880dc699635431f7c379
 -P 258e747bb7e3a2bc46f932cc2b06c2689d43aeb0
 -R 016d1b9c16d412ff926cdf599ae97f64
 -U dan
 -Z 8da7cca75b292da60a4687ff246cc6b3
++P b7489f9451628c68f1dfc1d457fc161a0921c631 fc157dd7f18c94b7ae5f155e1b4a5d7714b7da8c
++R e0ac31855803c332d28311de41dcc42f
 +U drh
- Z 4073b2f4a4cd5608e79ca3cad9ca9b28
++Z 01b0e5c37f35211bc16bf2591a3974d7
diff --cc manifest.uuid
index 7461209f05,0de4da3602..b6c1d34b27
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b7489f9451628c68f1dfc1d457fc161a0921c631
 -fc157dd7f18c94b7ae5f155e1b4a5d7714b7da8c
++cefad47ec2ad58d7ecd58bab9a261e4d5816cd69