Make the command-line shell ".dump" command more resilient in the face of

database corruption. (CVS 3496)

FossilOrigin-Name: ebd44f0b5e229b990910bb44565de9a5c06cb5bc

diff --git a/manifest b/manifest
index 9973753d2461a4b53fcaea70427d1763b1a126c4..22c8f80e3ec6e945fe25779b7572ff0f500ec635 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\ssupport\snon-ASCII\scharacters\sin\swin95\sfilenames.\nTicket\s#2047.\s(CVS\s3495)
-D 2006-10-30T13:37:22
+C Make\sthe\scommand-line\sshell\s".dump"\scommand\smore\sresilient\sin\sthe\sface\sof\ndatabase\scorruption.\s(CVS\s3496)
+D 2006-10-31T18:08:28
 F Makefile.in 4379c909d46b38b8c5db3533084601621d4f14b2
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -94,7 +94,7 @@ F src/printf.c b179b6ed12f793e028dd169e2e2e2b2a37eedc63
 F src/random.c d40f8d356cecbd351ccfab6eaedd7ec1b54f5261
 F src/select.c 6ba6d8ead43d0575ce1f8b418cc039f8f301389a
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
-F src/shell.c 3cd7e8460dd699df3127f78159021e1f820de458
+F src/shell.c e5bda308495ed580600c12325dc2007f74f85058
 F src/sqlite.h.in bf935004029631fd93d119bcf2f7259b9cb9ad5e
 F src/sqlite3ext.h 2c2156cc32a158e2b7bd9042d42accf94bff2e40
 F src/sqliteInt.h 637ef229c3d8e0f98096ab31c496efdf5361d678
@@ -419,7 +419,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 64762a9d582e4655d6bc5989d8e0ad773d659a7d
-R 5ec6d2ae141bcc5225f95a80dc3a18a6
+P 9fa3ae584ae4936696fd2f23a64697f0409ef313
+R 000cdc41e58c246d195b79d7b5adbe9e
 U drh
-Z 9d1a31671b051d96dc7533a8d807fa28
+Z b666da97eed5e567b2c6e3fa005b845f

diff --git a/manifest.uuid b/manifest.uuid
index 6490d01c87b4b06f51355d8487120e3edc29132c..bca976778684602e32a1242bc29d53a9ae0d94a1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9fa3ae584ae4936696fd2f23a64697f0409ef313
\ No newline at end of file
+ebd44f0b5e229b990910bb44565de9a5c06cb5bc
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 4ef32931d0f29c022fca8bd9cbe46fb0db3bc7bc..099104a874ea2458d1f6186ecf06f806f2c653cb 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.153 2006/10/27 14:21:54 drh Exp $
+** $Id: shell.c,v 1.154 2006/10/31 18:08:28 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -768,9 +768,6 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
       rc = run_table_dump_query(p->out, p->db, zSelect);
     }
     if( zSelect ) free(zSelect);
-    if( rc!=SQLITE_OK ){
-      return 1;
-    }
   }
   return 0;
 }