From: drh <drh@noemail.net>
Date: Fri, 1 Mar 2019 21:37:52 +0000 (+0000)
Subject: Merge recent changes from trunk.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22587cfd9e5c0fb609ce818e278bd1f6edf4700f;p=thirdparty%2Fsqlite.git

Merge recent changes from trunk.

FossilOrigin-Name: f270245a7b7b7d21a5f8d2a07eef0e5a56d15fb0c69024c666b047c3f3eb0eb9
---

22587cfd9e5c0fb609ce818e278bd1f6edf4700f
diff --cc manifest
index 0c55a89085,bcfe8dba8e..e2393343d9
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Merge\sthe\slatest\senhancements\sfrom\strunk.
- D 2019-03-01T18:27:38.496
 -C The\sfts3_tokenizer()\sfunction\sreturns\sNULL\sif\sthe\nSQLITE_DBCONFIG_ENABLE_FTS_TOKENIZER\ssetting\sis\sdisabled,\swhich\sis\sis\nby\sdefault.
 -D 2019-03-01T21:33:29.039
++C Merge\srecent\schanges\sfrom\strunk.
++D 2019-03-01T21:37:52.207
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 -F Makefile.in 1ad7263f38329c0ecea543c80f30af839ee714ea77fc391bf1a3fbb919a5b6b5
 +F Makefile.in d7de70a6d19d28154eb4f787e0839ede3748b797c4d83ebfdda356fbbbef1ce5
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 5df60c70edb157feb2148a14c687551969599bd065875a0b959b6b139721ca72
  F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
@@@ -518,13 -515,12 +518,13 @@@ F src/printf.c 93a3d539019264683a444bc0
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 09419ad5c432190b69be7c0c326e03abb548a97c2c50675b81b459e1b382d1d2
  F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
- F src/select.c c998f694759e37799929e28df8a2649747f8774d4fc233529ab6bda689388e15
+ F src/select.c 9263f5c30dd44c7ac2eb29f40a7ec64322a96885b71c00de6bc30b756c2e1c49
  F src/shell.c.in 249c0bf34f7ce272cb17162c297c45ab674a52a5d85193a86191f131196de47f
- F src/sqlite.h.in c945aa3dbc62c48308dd43429086a75eb0b3211cd5f29f340d281b382be35810
 -F src/sqlite.h.in f19f7b7646ccd331511b123e2e23d4dc3f3d02f74e1c04d2bb560ea50a323e4c
++F src/sqlite.h.in 2e2a6e7d067cc82a18aa73955daf70770d42f482589a14c7d246c325edc8125d
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h aee73ebaea1963e528b61408c01ba82f49fdf3dca9cbe940f3b0f3d9cec25942
  F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
 -F src/sqliteInt.h f253c4ec15e577a293a462e5049f8ea1d0c7a31819b3a88acdd24698df8f4d0b
 +F src/sqliteInt.h 3e3612cd37891a183572300c5bc65cb03f1fab57b83d278b484e88a49073e262
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1810,7 -1805,7 +1810,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 be71d1e24c9cbfbfa60df8159571929d85b1f281e32e6230b044c952eae91a92 9b2879629c34fc0a8e99d94648903eb93aabbc7a3682c80cb7382f9a9ca5ffb7
- R eb68f9a0a4812c37e1a89c4b5f47c94f
 -P 9a0a93c89d3fdd0f9000a9226388e2e53f299165e043913f40b83bf597bfea04
 -R 6bb845ba94b22e31200ba286777e2ff0
++P e64ded7b0478e96645ac7d8f36494244c972f85b12bb98b9db2655f142d1dc45 f5732f4caf7a37a6445c61ae0d0ac14cc9deb897376e73aa36a1ead025b92c69
++R cfdb503da7733676fa5c293f262a1ada
  U drh
- Z f28a4306383d13d2d83a1da57c62815a
 -Z f12ee49595ceb9a1e0b9ecd89bae7dff
++Z b034b66a0016c793ba46a8e0777f67f7
diff --cc manifest.uuid
index 912e27b60c,900a959e9c..af454798e6
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e64ded7b0478e96645ac7d8f36494244c972f85b12bb98b9db2655f142d1dc45
 -f5732f4caf7a37a6445c61ae0d0ac14cc9deb897376e73aa36a1ead025b92c69
++f270245a7b7b7d21a5f8d2a07eef0e5a56d15fb0c69024c666b047c3f3eb0eb9