Return SQLITE_ABORT if the underlying shadow tables change in the middle of an rtree...

FossilOrigin-Name: 32f85a5ce8e32506ad0cf309c86589958f38d924b4b3de532bec8bdb8e385fad

diff --cc ext/rtree/rtree.c
index 93a849cf0fd0456c3d25c4d78dabef73425d00df,3b26878c9ea88e95e5f6a8d80c8358c9b875b1db..578e6e862369d0bd8d5d0a5ea2a287bf75bcd86e
--- 1/ext/rtree/rtree.c
--- 2/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@@ -3242,15 -3241,9 +3241,8 @@@ static int rtreeEndTransaction(sqlite3_
    return SQLITE_OK;
  }
  static int rtreeRollback(sqlite3_vtab *pVtab){
--  Rtree *pRtree = (Rtree *)pVtab;
-   pRtree->iGeneration++;
    return rtreeEndTransaction(pVtab);  
  }
- static int rtreeRollbackTo(sqlite3_vtab *pVtab, int notUsed){
-   Rtree *pRtree = (Rtree *)pVtab;
-   pRtree->iGeneration++;
-   return SQLITE_OK;
- }
  
  /*
  ** The xRename method for rtree module virtual tables.

diff --cc manifest
index ff359ab048875e3b38e25f9bc1762449fc6f07c4,b07bcfff0d89be771b27b8696fac75679d5274aa..1639f718b80b51ae9a3a6e3cdb46203f53f42206
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Extend\s[d294a23ed6d]\sto\sapply\sto\sall\swasm\sspeedtest1\sbuilds.
- D 2024-02-05T03:56:02.476
 -C Return\sSQLITE_ABORT\sif\sthe\sunderlying\sshadow\stables\schange\sin\sthe\smiddle\sof\san\srtree\squery\sin\ssuch\sa\sway\sas\sto\sinvalidate\san\srtree\sinternal\spriority\squeue\sentry.
 -D 2024-02-05T17:35:36.153
++C Return\sSQLITE_ABORT\sif\sthe\sunderlying\sshadow\stables\schange\sin\sthe\smiddle\sof\san\srtree\squery\sin\ssuch\sa\sway\sas\sto\sinvalidate\san\srtree\sinternal\spriority\squeue\sentry.\sThis\sreplaces\sthe\sSQLITE_ABORT_ROLLBACK\smechanism\sadded\sin\s[af5c4251].
++D 2024-02-05T17:54:03.662
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -495,7 -495,7 +495,7 @@@ F ext/repair/test/checkindex01.test b53
  F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
  F ext/rtree/geopoly.c 0dd4775e896cee6067979d67aff7c998e75c2c9d9cd8d62a1a790c09cde7adca
- F ext/rtree/rtree.c 32e67b122e37138694d9f499cdc72241e372058560ac2d4577cfd68ccd692953
 -F ext/rtree/rtree.c d96c5d34eafcd46bc4b7645c26a4bcc3169d9e70e9df707ef91c2e90870d00d9
++F ext/rtree/rtree.c 920884cfeb88e8a77ef23d70bc696c1a59f2de03b8e877c0966ae81ea61aa41a
  F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
  F ext/rtree/rtree1.test 2b5b8c719c6a4abe377f57766f428a49af36a93061cb146cccfdc3b30000c0a4
  F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d
@@@ -2162,8 -2162,11 +2162,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P f8a8b9ee2eddf5f875c7c4399e750ccf1941f767560ebc2c88c083560f5aaae0
- R 8054a7da52bc11a97b67caaa9fc96227
- U stephan
- Z 47b7f55b1ab54c273898a455c5270730
 -P 26f848e5e0ac34e545d2f27cf33abc46eac13e04ed9cd71084b0f7d47136ff97
 -R ac07ea666046dd35038bc77784e8d419
 -T *branch * rtree-fix
 -T *sym-rtree-fix *
 -T -sym-trunk *
++P 26f848e5e0ac34e545d2f27cf33abc46eac13e04ed9cd71084b0f7d47136ff97 478280ef67efed854988ab4f740a38ae1937204c0434ad8da11f1869a12a6d06
++R 23677f173f1ac581895d1554488f83a5
++T +closed 478280ef67efed854988ab4f740a38ae1937204c0434ad8da11f1869a12a6d06
+ U dan
 -Z 6f11e0396699443c7473bed77f9c3651
++Z 1c1abeb44ec4a55c053a1bd1e00c844a
  # Remove this line to create a well-formed Fossil manifest.

diff --cc manifest.uuid
index 16ae9edaa3fd87c5407ddc32460e31242b5334ba,19b20648c9e452567e2a018be1a4b46c1950eda6..4f37fd460d9282a1bcf4076ab0732d2c9faee41e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 26f848e5e0ac34e545d2f27cf33abc46eac13e04ed9cd71084b0f7d47136ff97
 -478280ef67efed854988ab4f740a38ae1937204c0434ad8da11f1869a12a6d06
++32f85a5ce8e32506ad0cf309c86589958f38d924b4b3de532bec8bdb8e385fad