From: drh <drh@noemail.net>
Date: Tue, 26 Mar 2019 11:57:50 +0000 (+0000)
Subject: Merge recent trunk enhancements.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eadd64c0e2f32d346dbbdbc0f3195b7529d8187;p=thirdparty%2Fsqlite.git

Merge recent trunk enhancements.

FossilOrigin-Name: db4e2cc36acca2708e9bd2e0febb4e1b3d6a6a3fa60d9bd6f2a49f4a8d1bc523
---

3eadd64c0e2f32d346dbbdbc0f3195b7529d8187
diff --cc manifest
index d27a92ab6c,c7ae05097a..7b30fe5bec
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
- D 2019-03-21T17:22:05.442
 -C Fix\san\sobsolete\scomment\sin\sthe\sCLI.\s\sNo\scode\schanges.
 -D 2019-03-25T22:05:22.540
++C Merge\srecent\strunk\senhancements.
++D 2019-03-26T11:57:50.513
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -458,11 -457,11 +458,11 @@@ F src/auth.c 0fac71038875693a937e506bce
  F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 9bcd70009cac284622ef6816daca22fda99b4fb54ce0027b461dea52bcb299fa
+ F src/btree.c 6bea02598917ad9549d2d0c78bf8cc288eeb7a0b0f4298cbe1713db01340f9be
  F src/btree.h 63b94fb38ce571c15eb6a3661815561b501d23d5948b2d1e951fbd7a2d04e8d3
  F src/btreeInt.h 6111c15868b90669f79081039d19e7ea8674013f907710baa3c814dc3f8bfd3f
- F src/build.c 34ff50429a89568487368472d333bcf4ec10f0799ba4f774a6c0362099dcc8b4
 -F src/build.c 7c8851893fb616115d7f6ae1e07df5076c6d4a8f592cd2affa04f3112176c38c
 -F src/callback.c 25dda5e1c2334a367b94a64077b1d06b2553369f616261ca6783c48bcb6bda73
++F src/build.c c973531d609064c26a14ef4e54f2e0f721e504c31328157aadc2d5799889fd4d
 +F src/callback.c 5a9a83d7cecce452902da0a24bf51f6e4d232b5dc54b67418276ca9ad82c5bde
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 109e58d00f62e8e71ee1eb5944ac18b90171c928ab2e082e058056e1137cc20b
  F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
@@@ -481,7 -480,7 +481,7 @@@ F src/in-operator.md 10cd8f4bcd225a3251
  F src/insert.c 4ce12b5ba3bcbfa17ec37ce960d499fc287b6289df2c00b31201f716a3c7df45
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c e6f10875d52aca3b7e57ce1ec174aeafc9b6c00b43000cd30d791f9cb490b7a6
- F src/main.c cfc789be51029ac70b040a78e0d49919f85e698aded32ebb80f6c0c11637fb4b
 -F src/main.c 11714c8cefd458970cb1fd005251d0ad02ad69598893833b5564ffaaef192a1f
++F src/main.c c6cfaca007a217e46a9872c4e54c62807fd86f5ac658af1c8509e7d10fe437bf
  F src/malloc.c 0f9da2a66b230a5785af94b9672126845099b57b70a32c987d04ac28c69da990
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@@ -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 2030093cfa7b5cded3c3cff850115ff93dc5796fbf1e06e9686796d830112f72
- F src/sqlite.h.in 1fa197fc89b9924531ab0b6b07e2f7ae3e2862509c32c136e547752cd6374e49
 -F src/shell.c.in c1986496062f9dba4ed5b70db06b5e0f32e1954cdcfab0b30372c6c186796810
 -F src/sqlite.h.in 633ca2147938402fe43118db929a7949dde3e2a08c138e40bbdec12a0e696129
++F src/shell.c.in 30eac60e064eca559c173b46e243c912c30c90c34bdcaafeabb03b5537c72a1c
++F src/sqlite.h.in f0fbf5bd9b78965da87747ab0901ea05948a7908cb529918aae412531040544a
  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 b8e536089b0e6dec500a28556f826c99b78d979615ba3bc01ed31ead1b2112df 3649a77b79001ea6c5defe882f9934521b20b9d36aab26d03b5d42006c7fa228
- R e7d3f6eca8ee63cec685fe75b37581d9
- U dan
- Z 9dcdd497dfdbd8cba23760a1203f3738
 -P e775ef002dd33e6bcbeec8d4b6ad7f59749e35548c7a59c9fa3bcfdc5cc50730
 -R 3d12cfa0cda4f35a3d1533c43ce31db3
++P 3196f5f480f221dc71bb92e6718a5c356782774be25df4df79dda0ac1101255a fade103cbac1b067f9544935b767f36dc266aceb3269cc84a3ae3b04ad9a4823
++R 70fe5c4eb0d77c1597f63831f6a210b5
+ U drh
 -Z b5e63031019719c1b59c8c1822668f3c
++Z c1a61bb336e937c32caf25928a122f25
diff --cc manifest.uuid
index df371a93ce,188b3d1ce4..3fd5ec9fa2
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3196f5f480f221dc71bb92e6718a5c356782774be25df4df79dda0ac1101255a
 -fade103cbac1b067f9544935b767f36dc266aceb3269cc84a3ae3b04ad9a4823
++db4e2cc36acca2708e9bd2e0febb4e1b3d6a6a3fa60d9bd6f2a49f4a8d1bc523