Fix an LSM problem with read-only connections and compression (not

compression-factory) callbacks.

FossilOrigin-Name: 51ee5188b03c4b9508e94afaee4bf1f224aef28875efabda8ce09a5ab641d99e

diff --git a/ext/lsm1/lsm_shared.c b/ext/lsm1/lsm_shared.c
index c4bb9d6a23e2a7d4c17e594b84c01acf543627f8..2fdacf1eca3e75d148bf8bd9c32ea9427a5405cc 100644 (file)
--- a/ext/lsm1/lsm_shared.c
+++ b/ext/lsm1/lsm_shared.c
@@ -520,13 +520,11 @@ int lsmDbDatabaseConnect(
   ** recovery as necessary. Or, if this is a read-only database handle,
   ** defer attempting to connect to the system until a read-transaction
   ** is opened.  */
-  if( pDb->bReadonly==0 ){
-    if( rc==LSM_OK ){
-      rc = lsmFsConfigure(pDb);
-    }
-    if( rc==LSM_OK ){
-      rc = doDbConnect(pDb);
-    }
+  if( rc==LSM_OK ){
+    rc = lsmFsConfigure(pDb);
+  }
+  if( rc==LSM_OK && pDb->bReadonly==0 ){
+    rc = doDbConnect(pDb);
   }
 
   return rc;

diff --git a/manifest b/manifest
index a447c36649c46e5ba238bd07110b8d3f147ce2c4..9a1f7ef8fa2bee47483993391eeb481083456706 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sextensions\sfunctions\sin\sspellfix\sare\sall\sdeterministic.
-D 2017-11-03T08:46:48.968
+C Fix\san\sLSM\sproblem\swith\sread-only\sconnections\sand\scompression\s(not\ncompression-factory)\scallbacks.
+D 2017-11-04T08:53:37.599
 F Makefile.in b142eb20482922153ebc77b261cdfd0a560ed05a81e9f6d9a2b0e8192922a1d2
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc a55372a22454e742ba7c8f6edf05b83213ec01125166ad7dcee0567e2f7fc81b
@@ -245,7 +245,7 @@ F ext/lsm1/lsm_log.c a8bf334532109bba05b09a504ee45fc393828b0d034ca61ab45e3940709
 F ext/lsm1/lsm_main.c 15e73ccdafdd44ddeefc29e332079d88ba8f00c12c797b3c2b63d3171b5afce8
 F ext/lsm1/lsm_mem.c 4c51ea9fa285ee6e35301b33491642d071740a0a
 F ext/lsm1/lsm_mutex.c 378edf0a2b142b4f7640ee982df06d50b98788ea
-F ext/lsm1/lsm_shared.c 1a76b7a5e89a003c24d58f1fb295c4203b48ef6acba9a194ac6003ade09fcd47
+F ext/lsm1/lsm_shared.c 76adfc1ed9ffebaf92746dde4b370ccc48143ca8b05b563816eadd2aadf1c525
 F ext/lsm1/lsm_sorted.c a04518dfbfff0171fafb152a46e9fe9f45e1edbf3570e4533dd58ddb6567f0c9
 F ext/lsm1/lsm_str.c 65e361b488c87b10bf3e5c0070b14ffc602cf84f094880bece77bbf6678bca82
 F ext/lsm1/lsm_tree.c 682679d7ef2b8b6f2fe77aeb532c8d29695bca671c220b0abac77069de5fb9fb
@@ -1673,7 +1673,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d088c5a3f1a803118cb67560fc35c11178e1b7e54c0e1511677559906b9da980
-R b7838526febd368042ba32a4576c580c
-U drh
-Z 18ebbc1917110c35a4b2606f5ce6f533
+P 29ec855e13e0dcd675dcf12948b42f9e669d0a31c5d9efb95857888aba0beeee
+R 50deaa5f352753bc15393c76a6fab0d8
+U dan
+Z 685560e0f9310b127a265df0e79cb145

diff --git a/manifest.uuid b/manifest.uuid
index 5035b0e5a77256ed94093692ed5e1b785021eff7..e247d77f4b4020b9e3c1593c4394001d7c3641cd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-29ec855e13e0dcd675dcf12948b42f9e669d0a31c5d9efb95857888aba0beeee
\ No newline at end of file
+51ee5188b03c4b9508e94afaee4bf1f224aef28875efabda8ce09a5ab641d99e
\ No newline at end of file