From 4c54045372857367140cf07262185a2ccfac36fb Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 8 May 2018 23:17:36 +0000 Subject: [PATCH] Correctly format the STAT1 and STAT4 content in the output from the ".fullschema" command in the CLI. Fix for ticket [e63a34a0045832dc850367552]. FossilOrigin-Name: 0c3f128fd7d5738a8e9da706f5f30aa1985ef5efab70ddaad28ef6b641b04f4a --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/shell.c.in | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index a782d84718..509c95fbc1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sharmless\scompiler\swarning\sin\sfuzzcheck.\s\sAdd\snew\sOSSFuzz\stest\scases\nto\sthe\stest\scase\slibrary. -D 2018-05-08T13:03:31.809 +C Correctly\sformat\sthe\sSTAT1\sand\sSTAT4\scontent\sin\sthe\soutput\sfrom\sthe\n".fullschema"\scommand\sin\sthe\sCLI.\s\sFix\sfor\sticket\n[e63a34a0045832dc850367552]. +D 2018-05-08T23:17:36.373 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da @@ -494,7 +494,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/resolve.c 6415381a0e9d22c0e7cba33ca4a53f81474190862f5d4838190f5eb5b0b47bc9 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac F src/select.c a35d462ee7a3c0856ad7a9d9c8921fbf3d91d911a8f39ad9d61302eb43b24a71 -F src/shell.c.in e41979d8bf60d3e27220bf4b4adc819254e1d24ce176089a8d14c96228efd961 +F src/shell.c.in df233d5556008e330570da3dc4aa837af1df01d95ca5a15beb67b8515302c36a F src/sqlite.h.in 469aed42e75193b7f5d88d812befa961c04746869475f96fcf434c9f67079f66 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d @@ -1728,7 +1728,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P fd11fbd21893d520de5a2249f825ecb5839fa4943f5c207e9e9bf8b52f4e2695 -R 341265b3833d05f56ac0f5a3c8e3d52d +P d2619746cb233f4be127a77988548dd1d90eebddf0d0ac9107913b240553e5d0 +R 2f0b370ed5b99064180863fcf7e84b82 U drh -Z a9f407a471f5847cacaf3cf8ae748002 +Z a0a528b6dadf41d36c530fbf78ec0f01 diff --git a/manifest.uuid b/manifest.uuid index 30835e6856..8389cbd1d6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d2619746cb233f4be127a77988548dd1d90eebddf0d0ac9107913b240553e5d0 \ No newline at end of file +0c3f128fd7d5738a8e9da706f5f30aa1985ef5efab70ddaad28ef6b641b04f4a \ No newline at end of file diff --git a/src/shell.c.in b/src/shell.c.in index 73db9f8e93..1ea24fe592 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -6000,11 +6000,11 @@ static int do_meta_command(char *zLine, ShellState *p){ callback, &data, &zErrMsg); data.cMode = data.mode = MODE_Insert; data.zDestTable = "sqlite_stat1"; - shell_exec(p, "SELECT * FROM sqlite_stat1", &zErrMsg); + shell_exec(&data, "SELECT * FROM sqlite_stat1", &zErrMsg); data.zDestTable = "sqlite_stat3"; - shell_exec(p, "SELECT * FROM sqlite_stat3", &zErrMsg); + shell_exec(&data, "SELECT * FROM sqlite_stat3", &zErrMsg); data.zDestTable = "sqlite_stat4"; - shell_exec(p, "SELECT * FROM sqlite_stat4", &zErrMsg); + shell_exec(&data, "SELECT * FROM sqlite_stat4", &zErrMsg); raw_printf(p->out, "ANALYZE sqlite_master;\n"); } }else -- 2.47.2