From a9bc3cf736e6bd8e88ad1a01ddb19a756fcd7bd4 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 24 Jun 2014 20:19:21 +0000 Subject: [PATCH] Fix showstat4.c so that it decodes typecodes 8 and 9 correctly. FossilOrigin-Name: 9ca737c0b41f87998d842e7772c3e483bb291c50 --- manifest | 12 ++++++------ manifest.uuid | 2 +- tool/showstat4.c | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 14bc9eca79..fea0a6e2cc 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\sshowstat4.exe\sutility\sprogram\sfor\sdecoding\sand\sdisplaying\sthe\s\ncontent\sof\sthe\ssqlite_stat4\stable\sin\sa\sdatabase. -D 2014-06-24T00:59:15.223 +C Fix\sshowstat4.c\sso\sthat\sit\sdecodes\stypecodes\s8\sand\s9\scorrectly. +D 2014-06-24T20:19:21.030 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in b03432313a3aad96c706f8164fb9f5307eaf19f5 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -1160,7 +1160,7 @@ F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5 F tool/showdb.c b018a8a69d07050fc0fe9afcf17313cdef0cc599 F tool/showjournal.c b62cecaab86a4053d944c276bb5232e4d17ece02 -F tool/showstat4.c 47662af1e2c9567fd821da910b3a247c5c138021 +F tool/showstat4.c c39279d6bd37cb999b634f0064f6f86ad7af008f F tool/showwal.c 3f7f7da5ec0cba51b1449a75f700493377da57b5 F tool/soak1.tcl 8d407956e1a45b485a8e072470a3e629a27037fe F tool/space_used.tcl f714c41a59e326b8b9042f415b628b561bafa06b @@ -1180,7 +1180,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P ebec48921c092e20c9d7608242b63db40b40be5e -R 0ce5547c26474f508ca16bdace146cd3 +P b4d9f6053d1d95fdc1eab8ce610b51e7df8d896d +R 508dd98757238bd14305734cabeeae37 U drh -Z 0e7559d34a6f25f8be2f321b29251255 +Z 96b01d8567714808bc64d5917b4d4853 diff --git a/manifest.uuid b/manifest.uuid index 142fcbe956..5313f68aef 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b4d9f6053d1d95fdc1eab8ce610b51e7df8d896d \ No newline at end of file +9ca737c0b41f87998d842e7772c3e483bb291c50 \ No newline at end of file diff --git a/tool/showstat4.c b/tool/showstat4.c index c85ab1c770..668d2106af 100644 --- a/tool/showstat4.c +++ b/tool/showstat4.c @@ -106,6 +106,8 @@ int main(int argc, char **argv){ if( y+sz>nSample ) break; if( iVal==0 ){ printf("%sNULL", zSep); + }else if( iVal==8 || iVal==9 ){ + printf("%s%d", zSep, ((int)iVal)-8); }else if( iVal<=7 ){ v = (signed char)aSample[y]; for(j=1; j