From: drh <drh@noemail.net>
Date: Thu, 6 Dec 2018 03:13:02 +0000 (+0000)
Subject: Merge fixes from trunk.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef180caded9c81f31f5196603e806df5d0958cf3;p=thirdparty%2Fsqlite.git

Merge fixes from trunk.

FossilOrigin-Name: f2083ee410b7504e8478f7373e76ded913e3a6a92cb7345b8c1ac27554f6edf8
---

ef180caded9c81f31f5196603e806df5d0958cf3
diff --cc manifest
index a466a3074d,8e4122c157..60f0c0236a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sALTER\sTABLE\sand\ssqlite3_normalized_sql()\sbug\sfixes\sfrom\strunk.
- D 2018-12-06T00:08:48.697
 -C Merge\sbug\sfixes\sfrom\strunk.
 -D 2018-12-06T02:08:05.582
++C Merge\sfixes\sfrom\strunk.
++D 2018-12-06T03:13:02.222
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 68d0ba0f0b533d5bc84c78c13a6ce84ee81183a67014caa47a969e67f028fa1c
@@@ -516,7 -516,7 +516,7 @@@ F src/shell.c.in 1f0819e69fb1ebd2eb4469
  F src/sqlite.h.in 0880d9e366c2b0e1cbc40d32c2671e67c7bc7e9cb7f7298956c254ca8845c702
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
- F src/sqliteInt.h 6710aa71135f8d16bd616f62a901c887df882d892df152a502b5ccc94b7ef619
 -F src/sqliteInt.h d5c31063b7772cecb34126c5a9851ae667d6d5bb04b8f6ce4d9e150b7b43a923
++F src/sqliteInt.h c319213f1263293c6d569f73fc00fe4e7b1f95e20f5b626a624d0119046748de
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1795,7 -1795,7 +1795,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 342c9538d9c6a993ac0acaa6f74ad58886bcef7bb53783d053f9b24c131aec5d acf10b3f8d6675ddf787f7db55a9ff0ec5729adb6fa70b48b13d2cd71862cffd
- R f29cb469f2c6a9da9643ab919de7b25e
 -P acf10b3f8d6675ddf787f7db55a9ff0ec5729adb6fa70b48b13d2cd71862cffd 3a2c047989facc3461c63a2f9eed412014c951035a80da47c52a70139fb552de
 -R 48cbdaf1effbd452941445999c680fa0
++P 3793e5d5d60f909480c83bc2a6473d27e414d69b0c0e3289413c9bfd2f15bb08 1e13aaa29fb6324b60b3758bdab0491fdef9727e0de603d3da3e1885b52c5caa
++R dd458229efe2bd4f617c1d2a77c711e7
  U drh
- Z 271adff7c8392a332960561b0b6094cc
 -Z 64f034f82aaf45eb9c9f4c12ad38f84f
++Z 9f16233ebedc8eefab041382026e8a62
diff --cc manifest.uuid
index f022b88c70,d6abc6f006..039f6b3cde
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 3793e5d5d60f909480c83bc2a6473d27e414d69b0c0e3289413c9bfd2f15bb08
 -1e13aaa29fb6324b60b3758bdab0491fdef9727e0de603d3da3e1885b52c5caa
++f2083ee410b7504e8478f7373e76ded913e3a6a92cb7345b8c1ac27554f6edf8