From: drh <drh@noemail.net>
Date: Thu, 13 Dec 2018 15:52:31 +0000 (+0000)
Subject: Merge the dbtotxt enhancement from trunk.
X-Git-Tag: version-3.27.0~296^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fdbfuzz2-cases;p=thirdparty%2Fsqlite.git

Merge the dbtotxt enhancement from trunk.

FossilOrigin-Name: b386fce9a23e628dce7362dcca2904b8d0af6da58a6fe6eb7f12f058a8363e49
---

51caa04836a0504017f8204a6c179a6af5d007a5
diff --cc manifest
index a8e4afd737,127fdbd6ec..bb664d696d
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C New\sdatabase\scorruption\stest\scases\sdiscovered\sby\sdbfuzz2.\s\sThe\snew\scases\nhave\sbeen\sadded\sto\stest/fuzzdata7.db,\sbut\shave\snot\syet\sall\sbeen\sfixed,\nso\stests\swill\snot\scurrently\spass.
- D 2018-12-13T03:36:13.086
 -C Add\sthe\s"dbtotxt"\sutility\sprogram\sand\sthe\sability\sto\sread\s"dbtotxt"\soutput\nas\sa\sdeserialized\sinput\sdatabase\sin\sthe\sCLI,\susing\sthe\s--hexdb\soption\sto\nthe\s".open"\scommand.
 -D 2018-12-13T15:06:26.121
++C Merge\sthe\sdbtotxt\senhancement\sfrom\strunk.
++D 2018-12-13T15:52:31.619
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
- F Makefile.in 68d0ba0f0b533d5bc84c78c13a6ce84ee81183a67014caa47a969e67f028fa1c
+ F Makefile.in 2f1b61ac62689ca4e9cbff9fdb359578ea37ddd9252355ec0b7b9700ad56fe90
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc b7d4a710fa3f0b8cfc532ff195b85dc1ba2a8ad34343cb3d67639f28f0a24306
+ F Makefile.msc 2ef13d6845b899eaaa6122c69b74175656a97e26666567af795f4cfe41b7a673
  F README.md 377233394b905d3b2e2b33741289e093bc93f2e7adbe00923b2c5958c9a9edee
  F VERSION 453e2f4529ca208196d5567db28d549d7151f79efd33f6e6cfe6e613e583a0be
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -1784,10 -1786,7 +1786,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 2b690dbdffe144bd69ca0aa291c230faf3d9d73f7a2985d50f016fe54003f9a9
- R 44eae090dbc00ffed1ffd6b71877bb22
- T *branch * dbfuzz2-cases
- T *sym-dbfuzz2-cases *
- T -sym-trunk *
 -P eac9c0c49650b008951318a2225b932709a0a8dffbb01ed57684c40357b2e25c
 -R 4375ea249bc2f1867ed511e156cfaedb
++P b4210d320c6426d2838d4cc08709fdfd015c1c95fcad9a5f9e8fd390c23b9fad e3bf1d3ea5f748c5142c2403813fdace5aedc1fc68f0dcd5eae40a2fe763fedb
++R f29a990b635857a4ac73167c7e81e845
  U drh
- Z 83e3bf755a107d9d471054676d38303f
 -Z 5d7eea8bc66404385fe54bd1e1b7369f
++Z 899a9ea598b74391d5cfbd03300f9f81
diff --cc manifest.uuid
index 9b01d1fff7,4226c78984..1f8aa015e2
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b4210d320c6426d2838d4cc08709fdfd015c1c95fcad9a5f9e8fd390c23b9fad
 -e3bf1d3ea5f748c5142c2403813fdace5aedc1fc68f0dcd5eae40a2fe763fedb
++b386fce9a23e628dce7362dcca2904b8d0af6da58a6fe6eb7f12f058a8363e49