]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
For in-memory databases, it does not matter if pcache entries are marked
authordrh <drh@noemail.net>
Thu, 12 May 2016 12:08:48 +0000 (12:08 +0000)
committerdrh <drh@noemail.net>
Thu, 12 May 2016 12:08:48 +0000 (12:08 +0000)
"clean" or "writable".

FossilOrigin-Name: 06c1e27ca868f247f8c27b03eb19aac004f28650

1  2 
manifest
manifest.uuid
src/pager.c
src/pcache.c

diff --cc manifest
index eff6cd9a5e8d12e6ce8dbb17ad01a03bdbd7f270,529316813205bef4bdfd02af100ded8c7987ca1e..e3477b52b0d0c0ce6ac9f254d0d294c48880c07a
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Remove\san\sunnecessary\scall\sto\ssqlite3PcacheMakeClean()\sinside\sof\sthe\sROLLBACK\nlogic.
- D 2016-05-12T12:01:20.280
+ C For\sin-memory\sdatabases,\sit\sdoes\snot\smatter\sif\spcache\sentries\sare\smarked\n"clean"\sor\s"writable".
 -D 2016-05-11T23:54:14.261
++D 2016-05-12T12:08:48.058
  F Makefile.in 9eda6e1c90d05c199c3ec8a7069b0682ad307657
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc db82b35aef27f412fef14d8534afc022138bcdfd
@@@ -364,11 -364,11 +364,11 @@@ F src/os_setup.h c9d4553b5aaa6f73391448
  F src/os_unix.c a9443cdab41d7f3cdf0df3a5aab62fd6e1c9b234
  F src/os_win.c 852fc2ff6084296348ed3739c548b2cf32df394e
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
- F src/pager.c b7f9341d1c8917d0050f11597c588d0b4e379df9
 -F src/pager.c 76fe5ad6998772a6abda30145c181e99e7743a1d
++F src/pager.c baef5d8d31d220001fc61013f401c98950749201
  F src/pager.h 329bdf078a4e0a3b35084534d58625d21fd03681
  F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
- F src/pcache.c 0e8453c2aaa8a72e09c58edeb0f0976dc652e827
- F src/pcache.h 6b865be765d1ebd06145219550b10921c7da7cc9
 -F src/pcache.c 132a78c71bd510fde0085bfc44608bc64b945d48
++F src/pcache.c 5291b6ab838132f856fe8067ca25772d221c4864
+ F src/pcache.h 33b40350df1b6c278e019dee37f87e1bac276223
  F src/pcache1.c 7f51d2b541aab57596adf62db2c4bb025d34f04d
  F src/pragma.c faf42922bb7ab2f6672cb550356c1967abae3c84
  F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
@@@ -1488,7 -1488,10 +1488,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P bc202e5b418d5a57bfc766883c4417c94829d96e
- R 94f384a80fd36cfa7eab53c97f52730e
 -P 3bfd2621d13b4f842f3af6d35519653f4eb8cad7
 -R 399bfb6002bea3bb0fdfe001a40139f7
 -T *branch * pager-dev
 -T *sym-pager-dev *
 -T -sym-trunk *
++P 0dc50d9915cd88916229ca5c3834de82fa16f017 ad601c7962a60a11699cf31f1faee09b95d5c710
++R 7667d141b3239c7f232de8ca756273cf
++T +closed ad601c7962a60a11699cf31f1faee09b95d5c710
  U drh
- Z 3db2648b2bf79fa343d087598efa8f84
 -Z 75fe10a9420951c23350bd3808039177
++Z 488a663f0afeb720045f9ee67fd9acb5
diff --cc manifest.uuid
index e0fbea1e69795731540a5f45b739ddaec11d0c27,3e5a24e018e4d82fc331c61fec513aa510741921..90f4a0036f762de1097a39cc7d196c613b31c15a
@@@ -1,1 -1,1 +1,1 @@@
- 0dc50d9915cd88916229ca5c3834de82fa16f017
 -ad601c7962a60a11699cf31f1faee09b95d5c710
++06c1e27ca868f247f8c27b03eb19aac004f28650
diff --cc src/pager.c
Simple merge
diff --cc src/pcache.c
Simple merge