From: drh <drh@noemail.net>
Date: Thu, 6 Sep 2018 02:40:15 +0000 (+0000)
Subject: Fix a problem with geopoly trying to update both the _shape and an auxiliary
X-Git-Tag: version-3.25.0~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a09b7b31d079ee01a0cbfc0e27c268cde119851;p=thirdparty%2Fsqlite.git

Fix a problem with geopoly trying to update both the _shape and an auxiliary
column in the same UPDATE statement.

FossilOrigin-Name: 14c955152d0580abc3df1b363789f2925e013b9c957e550b1e6ebe83a82bae6c
---

diff --git a/ext/rtree/geopoly.c b/ext/rtree/geopoly.c
index 39629aee70..f0612a690b 100644
--- a/ext/rtree/geopoly.c
+++ b/ext/rtree/geopoly.c
@@ -1539,7 +1539,7 @@ static int geopolyUpdate(
   }
 
   /* Change the data */
-  if( rc==SQLITE_OK ){
+  if( rc==SQLITE_OK && nData>1 ){
     sqlite3_stmt *pUp = pRtree->pWriteAux;
     int jj;
     int nChange = 0;
diff --git a/manifest b/manifest
index 2379557377..92fc8890de 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sold\stestcase()\smacro\sthat\sis\sno\slonger\svalid.
-D 2018-09-05T16:16:56.322
+C Fix\sa\sproblem\swith\sgeopoly\strying\sto\supdate\sboth\sthe\s_shape\sand\san\sauxiliary\ncolumn\sin\sthe\ssame\sUPDATE\sstatement.
+D 2018-09-06T02:40:15.500
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in d06f463c5b623a61ac27f5cb8214fca9e53a6704d34d6b8f2124e2b1b293c88f
@@ -359,7 +359,7 @@ F ext/repair/test/checkfreelist01.test 3e8aa6aeb4007680c94a8d07b41c339aa635cc782
 F ext/repair/test/checkindex01.test 6945d0ffc0c1dc993b2ce88036b26e0f5d6fcc65da70fc9df27c2647bb358b0f
 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/geopoly.c 8ed95c3233ea38b6688cda8c07685cb6bf6e6e0b14208bad343c12c9f8252d3f
+F ext/rtree/geopoly.c d4cd584033fd4c2fd8a7a3077bbd2c6807a7ebfd3d1390e9533d128f24ce5f5f
 F ext/rtree/rtree.c ce94cbb319423fd739702582dde47371aec8ad85207d517c41bdbf75a7ffd737
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
 F ext/rtree/rtree1.test 309afc04d4287542b2cd74f933296832cc681c7b014d9405cb329b62053a5349
@@ -1758,7 +1758,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 f1138a38bd23f201a35621a71e82c5718abddb42ab82938e9516ab9d43e4df16
-R 8c1ec812a21bef0e00fe7356d77c5582
+P e628713338f6e584a32d5fc3436ddbd9ee8cf88401c321c1ebe7daa1e695c623
+R 2d9f86c9e887caa0a8758a6d1fe7409b
 U drh
-Z 9e5b746cf326cab70da9649d19c0539d
+Z 91ca9f97862a714dd5b411fa55fdf14a
diff --git a/manifest.uuid b/manifest.uuid
index 836d1b7a9f..67f6af9103 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e628713338f6e584a32d5fc3436ddbd9ee8cf88401c321c1ebe7daa1e695c623
\ No newline at end of file
+14c955152d0580abc3df1b363789f2925e013b9c957e550b1e6ebe83a82bae6c
\ No newline at end of file