]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Replace the assert() that was removed by [f023cb541b5dd72c] because
authordrh <>
Mon, 12 Feb 2024 19:12:30 +0000 (19:12 +0000)
committerdrh <>
Mon, 12 Feb 2024 19:12:30 +0000 (19:12 +0000)
[1cd5d4623f44af25] made it true again.

FossilOrigin-Name: 189a49f165dfc348a8730ad2b2288b9b2b2089b1de99fa2d515f2a90c9e7bd4e

ext/rtree/rtree.c
manifest
manifest.uuid

index 02127fa117887fea306a4f297e942bf90570ed13..11996d110cd9c0bac07f719cb9725abc3c462b78 100644 (file)
@@ -3225,6 +3225,7 @@ constraint:
 */
 static int rtreeBeginTransaction(sqlite3_vtab *pVtab){
   Rtree *pRtree = (Rtree *)pVtab;
+  assert( pRtree->inWrTrans==0 );
   pRtree->inWrTrans = 1;
   return SQLITE_OK;
 }
index aec907f877b4db70fa0048a07303f7c902a407fa..92c04c0d066c4d435b9be0862ef5edbc8e934d3e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Have\srtree\savoid\skeeping\sa\sblob\shandle\sopen\sfollowing\san\serror.
-D 2024-02-12T16:12:25.013
+C Replace\sthe\sassert()\sthat\swas\sremoved\sby\s[f023cb541b5dd72c]\sbecause\n[1cd5d4623f44af25]\smade\sit\strue\sagain.
+D 2024-02-12T19:12:30.456
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -495,7 +495,7 @@ F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c3350
 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 F ext/rtree/geopoly.c 0dd4775e896cee6067979d67aff7c998e75c2c9d9cd8d62a1a790c09cde7adca
-F ext/rtree/rtree.c bdf97fac91b37b3a6041ab4a0dd06e81c7ba1541601733b40f97fb51e76e79ce
+F ext/rtree/rtree.c 1baf9f6aa7251ddecdb019d914df4db46eb227720c00f89c485c66dbfdc7863d
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
 F ext/rtree/rtree1.test 2b5b8c719c6a4abe377f57766f428a49af36a93061cb146cccfdc3b30000c0a4
 F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d
@@ -2162,8 +2162,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2c675bd30568d3c530300beb3fcfaa17c9f063cdcb9a39ac68b9902100f641a6
-R 7630f9e2445b646399b67a3fa625e210
-U dan
-Z 2ae954926487fe7e892424e070aafe51
+P 1cd5d4623f44af25ab4f5af580354b3ae22cf5de4109e008ca41055125bb708d
+Q -f023cb541b5dd72c996f0574210344179217666a2229bc8d3fe057fdbc5c2245
+R d8d7ed01b0a724bd44cf51cd5b54db00
+U drh
+Z 301c11d3df27d865badec38ed88ff9b4
 # Remove this line to create a well-formed Fossil manifest.
index 4a963ad93e681e5576a42e7b0bdeec9661fc434d..aac78a6d6d2799e11204d71d9c152e313f3622a5 100644 (file)
@@ -1 +1 @@
-1cd5d4623f44af25ab4f5af580354b3ae22cf5de4109e008ca41055125bb708d
\ No newline at end of file
+189a49f165dfc348a8730ad2b2288b9b2b2089b1de99fa2d515f2a90c9e7bd4e
\ No newline at end of file