From: drh <drh@noemail.net>
Date: Tue, 8 Mar 2016 17:59:19 +0000 (+0000)
Subject: In memjournal.c, reuse the same sqlite3_file object for both the in-memory
X-Git-Tag: version-3.12.0~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c629e63a55d4ac2fc84125c261105e1d86ebb685;p=thirdparty%2Fsqlite.git

In memjournal.c, reuse the same sqlite3_file object for both the in-memory
phase and the on-disk phase.

FossilOrigin-Name: e7fbbdc25c0991d4e58d78a5fcb7386e1aa7f3af
---

c629e63a55d4ac2fc84125c261105e1d86ebb685
diff --cc manifest
index 40a77bc19a,40bd34b006..bb6f77ee42
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Drop\ssupport\sfor\sSQLITE_EXTRA_DURABLE.\s\sThe\snew\sSQLITE_DEFAULT_SYNCHRONOUS\ncompile-time\soption\sis\sa\smore\sgeneral\sreplacement.
- D 2016-03-08T16:07:59.373
 -C Modify\sthe\smemjournal.c\scode\sto\smake\sit\sa\sbit\ssmaller.
 -D 2016-03-08T17:44:08.043
++C In\smemjournal.c,\sreuse\sthe\ssame\ssqlite3_file\sobject\sfor\sboth\sthe\sin-memory\nphase\sand\sthe\son-disk\sphase.
++D 2016-03-08T17:59:19.784
  F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@@ -1455,7 -1455,10 +1455,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 2179a106e8dd7943d4f37093e65ce7826720904e
- R 82b2467863d1f8153e3f75a5d4f56472
 -P 1d9468d2427d2c9b7240b364554ac85a0b62fa44
 -R f53a6f3e4bc637f282a01c3504067543
 -T *branch * memjournal-exp
 -T *sym-memjournal-exp *
 -T -sym-trunk *
 -U dan
 -Z e2ab5ced3facb0c6a3be08b7e7370857
++P f6d3156ba9af1da517dd77c1df03fa7869888463 d99ac4154812065eef26c298de52954d7ee0bd75
++R bec56382cb26d93b90f8b590f852c457
++T +closed d99ac4154812065eef26c298de52954d7ee0bd75
 +U drh
- Z ded4eae64cbc81643a193c9cf7561702
++Z 55dc3dcac976fd228dc3d62385f9ab1a
diff --cc manifest.uuid
index d7438755d1,c324dea819..45d67c3642
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- f6d3156ba9af1da517dd77c1df03fa7869888463
 -d99ac4154812065eef26c298de52954d7ee0bd75
++e7fbbdc25c0991d4e58d78a5fcb7386e1aa7f3af