From: drh <drh@noemail.net>
Date: Wed, 10 Jul 2019 17:58:29 +0000 (+0000)
Subject: Merge the 3.29.0 release into the apple-osx branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b03c95662d0a58ac4d1d79a74235339e54cd96bb;p=thirdparty%2Fsqlite.git

Merge the 3.29.0 release into the apple-osx branch.

FossilOrigin-Name: 87aa1d7051438a941c83967cfe35cb71df2cf2a2045ecfe43ce3bdb817774619
---

b03c95662d0a58ac4d1d79a74235339e54cd96bb
diff --cc ext/rtree/rtree.c
index 2ce923eaee,ea5e737aa3..5918a9ee76
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@@ -75,7 -70,17 +70,18 @@@ typedef sqlite3_uint64 u64
  typedef unsigned char u8;
  typedef unsigned short u16;
  typedef unsigned int u32;
+ #if !defined(NDEBUG) && !defined(SQLITE_DEBUG)
+ # define NDEBUG 1
+ #endif
+ #if defined(NDEBUG) && defined(SQLITE_DEBUG)
+ # undef NDEBUG
  #endif
+ #endif
+ 
+ #include <string.h>
+ #include <stdio.h>
+ #include <assert.h>
++#include <stdint.h>
  
  /*  The following macro is used to suppress compiler warnings.
  */
diff --cc manifest
index d1f1b7ec0b,fcf4a4f733..7253e07fea
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\srecent\senhancements\sfrom\strunk\sinto\sapple-osx.
- D 2019-07-08T20:59:23.354
 -C Version\s3.29.0
 -D 2019-07-10T17:32:03.802
++C Merge\sthe\s3.29.0\srelease\sinto\sthe\sapple-osx\sbranch.
++D 2019-07-10T17:58:29.882
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -376,7 -376,7 +376,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 c591164125808f8bba9659e92665b78412cd263e654b6f05294f3a8da7cdd9fb
- F ext/rtree/rtree.c 117214a6d86a3ffe8d51f0915ab94dba2cb65d64fd87593b429a95c210c8616d
 -F ext/rtree/rtree.c 78c0d989c32e5baac471f0463e83cda5006c7e71ded39d633b5fc001a301a26e
++F ext/rtree/rtree.c bc1bfc20097e5c4724fbf7f5b54c940bd0c069364e6f9b3fd7f375d7fbd7113b
  F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
  F ext/rtree/rtree1.test 7573134f1b4f59df36c1b0a6de51268fd3b9c714d91f3811482263e734e416ea
  F ext/rtree/rtree2.test 5f25b01acd03470067a2d52783b2eb0a50bf836803d4342d20ca39e541220fe2
@@@ -598,13 -594,13 +598,13 @@@ F src/upsert.c 0dd81b40206841814d46942a
  F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
  F src/util.c aef606a78b85d042138a841babbc0f98471b19b9a340b962e8fae307bc8cf3da
  F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
 -F src/vdbe.c aaa36d1ac7d55baf007e9c03ee7c826834a51dfe7a56ba4c386318695dd87c99
 +F src/vdbe.c 78bf0030f1fe925fd694336ccbf33a5dc4652830179dc809f6ebf81e12e4f835
  F src/vdbe.h 712bca562eaed1c25506b9faf9680bdc75fc42e2f4a1cd518d883fa79c7a4237
  F src/vdbeInt.h 3ba14553508d66f58753952d6dd287dce4ec735de02c6440858b4891aed51c17
 -F src/vdbeapi.c f9161e5c77f512fbb80091ce8af621d19c9556bda5e734cffaac1198407400da
 +F src/vdbeapi.c 63d9046414121450108a7a6538a35e5cb4e5637894652d8fb766c6c66db6e1ba
  F src/vdbeaux.c 3a803d75875031309204df90977059b12ffb706d16b4baa5e2d99f4353962582
  F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
- F src/vdbemem.c 9ee3c0373bfc05dc8bf5307a4a92be6bea3055928c4846fdced7e708993b2d6d
+ F src/vdbemem.c f6f277d17d50972571d1394535d4c3d156fdea871d8f327f5b9479984054015a
  F src/vdbesort.c 66592d478dbb46f19aed0b42222325eadb84deb40a90eebe25c6e7c1d8468f47
  F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
  F src/vtab.c 1fa256c6ddad7a81e2a4dc080d015d4b0a7135767717d311298e47f6fca64bb3
@@@ -1836,7 -1831,10 +1836,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 40362d5181c8cd0167628a414573d4e23c5a7cc211f8ecddb747cb0966a1d579 36295dcebcb5487f2a462eabb41900ac28b8e839898ef0fae0aa4730bf9b0671
- R 28678d16969ce42cb9ebd3eca1ab227b
 -P 6f328c35947d6b3a0741514757b8944692203e89bdb2e7f9bbce8ad9288be344
 -R 3dc95c8af87e7b557da20a5426ebc03a
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.29.0 *
++P de88ed862e95d89b2887d106761d507afc35dbd787785fd5af539d33c9b17812 fc82b73eaac8b36950e527f12c4b5dc1e147e6f4ad2217ae43ad82882a88bfa6
++R 4976378fe3d276767f1d40c625780745
  U drh
- Z 18b381ba8528fa7aabc03ba8bfcd128d
 -Z 4d356946c4c6edd871b6d6986b095a05
++Z 9f677b7b8a9af40c8b6ea8654ae23094
diff --cc manifest.uuid
index e0255826f7,0a078bf4da..cefca5cc03
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- de88ed862e95d89b2887d106761d507afc35dbd787785fd5af539d33c9b17812
 -fc82b73eaac8b36950e527f12c4b5dc1e147e6f4ad2217ae43ad82882a88bfa6
++87aa1d7051438a941c83967cfe35cb71df2cf2a2045ecfe43ce3bdb817774619