From: dan <dan@noemail.net>
Date: Thu, 21 Mar 2019 17:22:05 +0000 (+0000)
Subject: Merge latest trunk changes with this branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d32261e7a97e8d62076b558d7a46267b65ed7210;p=thirdparty%2Fsqlite.git

Merge latest trunk changes with this branch.

FossilOrigin-Name: 3196f5f480f221dc71bb92e6718a5c356782774be25df4df79dda0ac1101255a
---

d32261e7a97e8d62076b558d7a46267b65ed7210
diff --cc manifest
index b8cb9f4b06,1603306874..d27a92ab6c
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Disable\sthe\sfeature\son\sthis\sbranch\sin\snon-SQLITE_ENABLE_SHARED_SCHEMA\sbuilds.
- D 2019-03-21T17:13:55.850
 -C In\sthe\sCLI,\sgive\sbetter\serror\smessages\sif\ssomething\sgoes\swrong\nwith\sthe\s".dbinfo"\scommand.
 -D 2019-03-20T18:22:51.910
++C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
++D 2019-03-21T17:22:05.442
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -461,8 -460,8 +461,8 @@@ F src/btmutex.c 8acc2f464ee76324bf13310
  F src/btree.c 9bcd70009cac284622ef6816daca22fda99b4fb54ce0027b461dea52bcb299fa
  F src/btree.h 63b94fb38ce571c15eb6a3661815561b501d23d5948b2d1e951fbd7a2d04e8d3
  F src/btreeInt.h 6111c15868b90669f79081039d19e7ea8674013f907710baa3c814dc3f8bfd3f
- F src/build.c 83ab73704ba4040b58a68079d2e7190e33ac07b0c6cb0ad829816312055bbf39
 -F src/build.c 0f88a2f52c80da71ceb6e95831622aa4aeda758b69011bde9eb87840c8d38672
 -F src/callback.c 25dda5e1c2334a367b94a64077b1d06b2553369f616261ca6783c48bcb6bda73
++F src/build.c 34ff50429a89568487368472d333bcf4ec10f0799ba4f774a6c0362099dcc8b4
 +F src/callback.c 5a9a83d7cecce452902da0a24bf51f6e4d232b5dc54b67418276ca9ad82c5bde
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 109e58d00f62e8e71ee1eb5944ac18b90171c928ab2e082e058056e1137cc20b
  F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
@@@ -518,15 -517,15 +518,15 @@@ F src/random.c 80f5d666f23feb3e6665a6ce
  F src/resolve.c 09419ad5c432190b69be7c0c326e03abb548a97c2c50675b81b459e1b382d1d2
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
  F src/select.c 9263f5c30dd44c7ac2eb29f40a7ec64322a96885b71c00de6bc30b756c2e1c49
- F src/shell.c.in c82e5dce0bb03a63db6ce53070d1eb0692c50b9c2bcf8e2d6ade4a743a7a53bd
 -F src/shell.c.in 576ba793cf166ea7055b7a1a2bea058242ca532ba84753e789b9c88790019b70
 -F src/sqlite.h.in e33a4df7e32d742aac29623b38a1edd7e07a2b964a5d0257e2923c8a724faddc
++F src/shell.c.in 2030093cfa7b5cded3c3cff850115ff93dc5796fbf1e06e9686796d830112f72
 +F src/sqlite.h.in 1fa197fc89b9924531ab0b6b07e2f7ae3e2862509c32c136e547752cd6374e49
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
 -F src/sqliteInt.h f253c4ec15e577a293a462e5049f8ea1d0c7a31819b3a88acdd24698df8f4d0b
 +F src/sqliteInt.h 0d7cbc244dcc508a6bc6cf89a0af5f25ee5d28ac9c5cbe6c563290fdc0197d03
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 -F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 +F src/status.c d9f7d66ae8bee9ffbe4cf7ae72a8d3d429a269336dee1e705ecb3dbea27fa5e2
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
 -F src/tclsqlite.c cfe7f93daf9d8787f65e099efb67d7cdfc2c35236dec5d3f6758520bd3519424
 +F src/tclsqlite.c 5947f3797410e213cde1d61f61fbfda706ee4ee2e1db6e0b2376e3206dabc71d
  F src/test1.c cfb303eeddd3670409af6b58d2ddb928b8e9e70822d681d3df88dfaabb7bea6a
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
@@@ -1815,7 -1807,7 +1815,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 c1be211c0286a6ff3ef8ab6839136175efb000118ff8704d3cc01b2a23b841ab
- R 29b54ab2e06b9087f7fabff74d0fd117
 -P b9e2393cf201e3fc24519c5ae65d0a5953147d78884e53d44a7958747b4a7e13
 -R bac077ecc3827c57122ba7154b5e4a1d
 -U drh
 -Z 6a80d73acf1c73bf71a6659d9de2609c
++P b8e536089b0e6dec500a28556f826c99b78d979615ba3bc01ed31ead1b2112df 3649a77b79001ea6c5defe882f9934521b20b9d36aab26d03b5d42006c7fa228
++R e7d3f6eca8ee63cec685fe75b37581d9
 +U dan
- Z 22c9b5d8d7092496164e8327b898d8b0
++Z 9dcdd497dfdbd8cba23760a1203f3738
diff --cc manifest.uuid
index fb6d213092,e31be56ea8..df371a93ce
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b8e536089b0e6dec500a28556f826c99b78d979615ba3bc01ed31ead1b2112df
 -3649a77b79001ea6c5defe882f9934521b20b9d36aab26d03b5d42006c7fa228
++3196f5f480f221dc71bb92e6718a5c356782774be25df4df79dda0ac1101255a