From: dan <dan@noemail.net>
Date: Wed, 20 Mar 2019 16:03:02 +0000 (+0000)
Subject: Merge latest trunk changes into this branch.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d46c528ddf0bd2103376555e41251cd011ba8e4;p=thirdparty%2Fsqlite.git

Merge latest trunk changes into this branch.

FossilOrigin-Name: 4cd20ca6776ef1c2f041fe6d30f84a3cf5f8a634eb34db2dce3217ee781d5848
---

0d46c528ddf0bd2103376555e41251cd011ba8e4
diff --cc manifest
index 88295cb2f8,a719feac7f..cf76725889
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,12 +1,12 @@@
 -C Fix\sharmless\scompiler\swarnings\sfrom\sMSVC.
 -D 2019-03-20T12:08:27.465
 +C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
- D 2019-03-04T07:25:38.382
++D 2019-03-20T16:03:02.054
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 95ac54f7a7f164c51ef22c7ef28e06d396402d0cbb200dd0bdf08829116bda14
+ F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 -F Makefile.in 236d2739dc3e823c3c909bca2d6cef93009bafbefd7018a8f3281074ecb92954
++F Makefile.in a254c5e3f62d0b8817ef936e1aa42dced4a2364675687fab9b02fcd11db1b9c9
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc 5df60c70edb157feb2148a14c687551969599bd065875a0b959b6b139721ca72
 +F Makefile.msc bdc4f060e04769b7729b309becc0c3c5623c0f9d98b4d06da9b9ab029f2bad99
- F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
+ F README.md ebcdb6d5656020ef5ca37a6fc1ad89b4c80560ea33a3d70c250f9b845cf9da62
  F VERSION 288d756b1b7be03ecdbf1795c23af2c8425f2e46ba6979a14ef53360308f080d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -450,18 -450,18 +451,18 @@@ F spec.template 86a4a43b99ebb3e75e6b9a7
  F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
  F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
  F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
- F src/alter.c 995b37de876639f1b6c14fcf15f3ee1004e3cbea354ebb43d7f5c4de0d649a64
 -F src/alter.c 25f54387121a0c5fd0f49b299f4070c81af8f26a84edaae6de679c4e4b71b1ff
 -F src/analyze.c 58db66344a5c58dcabb57f26696f6f2993956c830446da40b444051d2fdaf644
 -F src/attach.c 732d45dbf802b79f66503614a23e862887231d4d4937eac7c28a92c6fdb78e1f
++F src/alter.c 7516a6e36dd5634ef7f28541c5dfc3861f2e619ffa9d0aeab54c565d1254f0f6
 +F src/analyze.c e75c3c1d6534265f74a4763282f17e9ad946606ef0a68c5517fcfb355cc243d0
- F src/attach.c aef8849d3d05da5f57a4054b855c83f1fca61179fc12592e56a57f35bbd1ba39
++F src/attach.c bc39b4705cb182aee145baabb972581d36a66c89efda207cee4928259a301f4e
  F src/auth.c 0fac71038875693a937e506bceb492c5f136dd7b1249fbd4ae70b4e8da14f9df
  F src/backup.c 78d3cecfbe28230a3a9a1793e2ead609f469be43e8f486ca996006be551857ab
  F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
  F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
- F src/btree.c 59695c6e5eb527bfefc2b3d8ffebd178ad8686eaeb810c9f57719d6d2b72822e
+ F src/btree.c 9bcd70009cac284622ef6816daca22fda99b4fb54ce0027b461dea52bcb299fa
  F src/btree.h 63b94fb38ce571c15eb6a3661815561b501d23d5948b2d1e951fbd7a2d04e8d3
  F src/btreeInt.h 6111c15868b90669f79081039d19e7ea8674013f907710baa3c814dc3f8bfd3f
 -F src/build.c 3acec29b23948042173301a8befebae01a98344debf66cbd4467c8b9077707b8
 -F src/callback.c 25dda5e1c2334a367b94a64077b1d06b2553369f616261ca6783c48bcb6bda73
 +F src/build.c f556ca5fe2c6a2a8c78bc7303a772f1d86979738cbdec112fbddca3f5505143a
 +F src/callback.c 0d68a032872495351f70d533610a94388a4f191cce37ec7663d6598eaa8a4a21
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 109e58d00f62e8e71ee1eb5944ac18b90171c928ab2e082e058056e1137cc20b
  F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
@@@ -517,16 -517,16 +518,16 @@@ 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 0ba394168b2ade14df18a7b0effbc274bc2d95ae602d60ec133645f564bb06c8
- F src/sqlite.h.in 232002b316f326120cfbd5401a7e2ac54fe80d2f23412990d34649ac12779ab0
 -F src/shell.c.in 01c0cc01391d00d247fdf640052d38c267fc16d975bc4f3154a02277c232dbeb
 -F src/sqlite.h.in e33a4df7e32d742aac29623b38a1edd7e07a2b964a5d0257e2923c8a724faddc
++F src/shell.c.in 84f22bfbceb3134db28da6f6cae75ef15f44b3c4615566597e5643f382e61d9b
++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 f285e974103537be2c79e3ebf6535d21b477ecd05f131397cee78fcf42280d9e
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 -F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 +F src/status.c 28fcf86faee5cc030ca2d5d6b356fc59999cffb478457fe343ae0f9c39b41f6b
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
 -F src/tclsqlite.c cfe7f93daf9d8787f65e099efb67d7cdfc2c35236dec5d3f6758520bd3519424
 +F src/tclsqlite.c 9514e43ebd89325e150fad84b164e2b9ba221050b392ab444f4e7f9e8af46082
- F src/test1.c 353b066e7ec761c4c715c1c20b888e0e7a0b0c0eda7f68c110e032d63713cade
+ F src/test1.c cfb303eeddd3670409af6b58d2ddb928b8e9e70822d681d3df88dfaabb7bea6a
  F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
  F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
  F src/test4.c 18ec393bb4d0ad1de729f0b94da7267270f3d8e6
@@@ -587,13 -586,13 +588,13 @@@ F src/update.c 0b973357d88092140531e07f
  F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c 82a2e3f691a3b654be872e305dab1f455e565dedf5e6a90c818c1ab307c00432
- F src/vacuum.c 7dbed4a756f014f3ce54e6ae3c403ee725e8179cf73fc6dd5c064e5627649f9f
 -F src/vacuum.c 532553ee1d47f69c1198858107b1f3af3d16af25f2ab4ce3b1263d9e333f26e2
 -F src/vdbe.c f1e7b5320df80ff58c67176e35cb48062cbda2a9c9811f11db5faa48071d3fe4
 -F src/vdbe.h 712bca562eaed1c25506b9faf9680bdc75fc42e2f4a1cd518d883fa79c7a4237
++F src/vacuum.c 04b2721354a7398559ddd245cca4df1f814e7a9df9e9466212e0d5958edfd6ce
 +F src/vdbe.c e172d15879087eedd047c8ed54f9d69c40bb57c74c94ade070024c1bc3925d9b
 +F src/vdbe.h 323218c4bfd64c719ba85d05fbc87cdd126991cadb39e73ccac7b59f30c3d53e
  F src/vdbeInt.h a76d5eed62c76bcd8de7afd3147fac1bc40c5a870582664bcd7d071ef437c37f
- F src/vdbeapi.c 0eb687d3287d6ab45661f7ffcabbda6f345713e800ef0f29053597933ca2a0bf
- F src/vdbeaux.c 2f4fefdf74c484193de632c3c417c5886512f7a57f69a65dbdb858a58bc3f55a
+ F src/vdbeapi.c 7a052df80d7e2e55382076174633e888f21fe200feb5d49b1b441b4c38ab851a
 -F src/vdbeaux.c 7aa412e7e56eb53649d87766f3064994a31991ee2b2716bf8c3129fa15cc7653
 -F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
++F src/vdbeaux.c 5c792e5425fe9a29e1a4ffaa4bdd18b279b3a17443bf4528b7eb89645b86f541
 +F src/vdbeblob.c 08e58c6bef990008b8c2dbad4c99c56d3b622ee79433004484cce29b536e2ab9
  F src/vdbemem.c 3e89e087df928eba80e520824078dc563c579a0848b1557ac36845ec14392923
  F src/vdbesort.c 90aad5a92608f2dd771c96749beabdb562c9d881131a860a7a5bccf66dc3be7f
  F src/vdbetrace.c 79d6dbbc479267b255a7de8080eee6e729928a0ef93ed9b0bfa5618875b48392
@@@ -1813,7 -1807,8 +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 0ce2092a5968d75d014fdc238391c362a9600c28bf18cdc631e98259a5278712 906d1fd8650874236e0bf5734d5347dcc45ec036164a56570fec37da4ffeaf8f
- R 0a4fdc60a78ba5a12c576da11b5b88c8
 -P 90acdbfce9c088582d5165589f7eac462b00062bbfffacdcc786eb9cf3ea5377 1c0fe5b5763fe5cbace9773dcdab742e126d0bd035ab13d61f9d134afa0afc0c
 -R 417e85939120e076f0d5850acd5f41fd
 -T +closed 1c0fe5b5763fe5cbace9773dcdab742e126d0bd035ab13d61f9d134afa0afc0c
 -U drh
 -Z a56e1576d70fb974480a5e8f7221fe60
++P 97a9604d85cf5044e8109e533d4682b25bfe6a110f403ebd0fdef03880059f37 f0f02d46e40667d0fc31c57eb26d459ce2f3a3c222c767fa371100b36e5335d1
++R 9e634e6e7aa4a351cbb067ba7310f572
 +U dan
- Z 8334d61294986878168d00e5d51379c9
++Z 5648d16c5beee34b02bc9de30c4c0265
diff --cc manifest.uuid
index a091bf7896,fc12ba30fa..475db5eaeb
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 97a9604d85cf5044e8109e533d4682b25bfe6a110f403ebd0fdef03880059f37
 -f0f02d46e40667d0fc31c57eb26d459ce2f3a3c222c767fa371100b36e5335d1
++4cd20ca6776ef1c2f041fe6d30f84a3cf5f8a634eb34db2dce3217ee781d5848
diff --cc src/attach.c
index c4bb13de6e,65b98a623f..035d780120
--- a/src/attach.c
+++ b/src/attach.c
@@@ -231,14 -231,14 +231,14 @@@ static void attachFunc
    ** way we found it.
    */
    if( rc==SQLITE_OK ){
 -    sqlite3BtreeEnterAll(db);
      db->init.iDb = 0;
-     if( !IsReuseSchema(db) ){
-       db->mDbFlags &= ~(DBFLAG_SchemaKnownOk);
+     db->mDbFlags &= ~(DBFLAG_SchemaKnownOk);
 -    if( !REOPEN_AS_MEMDB(db) ){
++    if( !IsReuseSchema(db) && !REOPEN_AS_MEMDB(db) ){
 +      sqlite3BtreeEnterAll(db);
        rc = sqlite3Init(db, &zErrDyn);
 +      sqlite3BtreeLeaveAll(db);
 +      assert( zErrDyn==0 || rc!=SQLITE_OK );
      }
 -    sqlite3BtreeLeaveAll(db);
 -    assert( zErrDyn==0 || rc!=SQLITE_OK );
    }
  #ifdef SQLITE_USER_AUTHENTICATION
    if( rc==SQLITE_OK ){