Fix the ".dump" command on the command-line shell so that it works for

"sqlite_stat4" in addition to "sqlite_stat1".

FossilOrigin-Name: 1e80c4b12dbb5beab422e2a33a8782ac9d767321

diff --git a/manifest b/manifest
index c52dcb9af8cf86bd685d69859f32a08e4d038f0e..bce64529b7bf8dedf7314d06f6c3aa337ca11094 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\sunused\ssqlite3Utf8to16()\sutility\sfunction.
-D 2013-08-07T15:57:24.962
+C Fix\sthe\s".dump"\scommand\son\sthe\scommand-line\sshell\sso\sthat\sit\sworks\sfor\n"sqlite_stat4"\sin\saddition\sto\s"sqlite_stat1".
+D 2013-08-07T16:04:27.058
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -217,7 +217,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 17e670996729ac41aadf6a31f57b4e6f29b3d819
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 F src/select.c 20369c82dc38eb4a77b458c8f6e353ef550580c9
-F src/shell.c 52f975eae87c8338c4dfbf4c2842d2a0971f01fd
+F src/shell.c cb075e24f125e08cc6deb4d8837b0b7ff394e65d
 F src/sqlite.h.in 442c109e0c3447c34b1794971ecdb673ce08a843
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
@@ -1106,7 +1106,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 353950a5269fa439cc3e57b62e16558a84ea2557
-R 09ec399fdfd502185b4c383f87ff6d6c
+P 9159b43eb2cb5d6ed18a5ad168fa27134fec2553
+R f3f1a72dd300dcd2969e458028afbec5
 U drh
-Z 7e0f07555c210e239e313baee1455f2b
+Z 194a793cc38dc0b3add1e00828469db6

diff --git a/manifest.uuid b/manifest.uuid
index cd6114b4304aa935f1a45bc1d37660744678370f..1c323591dfd7eaf3b18b4eb8d0cfc4c6deff6eee 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9159b43eb2cb5d6ed18a5ad168fa27134fec2553
\ No newline at end of file
+1e80c4b12dbb5beab422e2a33a8782ac9d767321
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 7b8a8ad7f305b2bdbbcb921b1938843440b4ba92..7b01d45c84f3e605ac5688f75fbb4248eae9c603 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -1285,7 +1285,7 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
   
   if( strcmp(zTable, "sqlite_sequence")==0 ){
     zPrepStmt = "DELETE FROM sqlite_sequence;\n";
-  }else if( strcmp(zTable, "sqlite_stat1")==0 ){
+  }else if( sqlite3_strglob("sqlite_stat?", zTable)==0 ){
     fprintf(p->out, "ANALYZE sqlite_master;\n");
   }else if( strncmp(zTable, "sqlite_", 7)==0 ){
     return 0;