The command-line shell ignore errors in sqlite3_close() when shutting down.

FossilOrigin-Name: 925332c3d79f6252895ff1a367f795630619247e

diff --git a/manifest b/manifest
index f8e150b6ed5f4119a9e692f7e786b2e23186650a..36254014d3771e21227458cb8b88c616714b2818 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Changes\sto\sthe\sshell\swhich\sshould,\sin\stheory,\sallow\sit\sto\swork\swith\nlibeditline\sas\san\salternative\sto\slibreadline.
-D 2010-12-08T00:02:26
+C The\scommand-line\sshell\signore\serrors\sin\ssqlite3_close()\swhen\sshutting\sdown.
+D 2010-12-08T03:28:17
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -178,7 +178,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c 8a7ba246b0b4bb45df7fbc52681728a0e3deaaa7
-F src/shell.c 7b429fc7441594abcc5b97b4756a5f0a0a098e1b
+F src/shell.c ee5905fef7bf8dfceaf31ee32db92a250c5acab4
 F src/sqlite.h.in d0cd88c447f25ead403bca04ebd8fe93e035f820
 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 F src/sqliteInt.h b96d5ddb8b419a2ed7cf69a7778b53872d73e8a7
@@ -897,14 +897,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 43935548ae79d4d1a71549820a77368cda77104a
-R fd202792c0017998f8a242e921dc5a93
+P e474fd9e7f89644a7840e33e9df03dbaa4dd28bd
+R 7edcb2582417e56eb98f0dae455ae31e
 U drh
-Z 6ca1c6e52bb72fad878f40ab29ea43f7
+Z b15026da9128033b9dc0a7b0dce2ca83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFM/ssWoxKgR168RlERArYWAJ9xDo6ujSZYl3PfXvHcS3k6gSuHwACdHVf9
-uErtwsOokR+Gj4AK0f8GS0M=
-=EZ4n
+iD8DBQFM/vtUoxKgR168RlERAi0wAJ4nUq0PfKIRivnR/wjbLVQFsF5neACfb8+m
+fqFov7rgIDAItG1ZstpEvGo=
+=CHf6
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index afc682821da491a031245c6540dd282deda26c03..2287c208e6aa3f36ce7d663225fb7cc88c882cbb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e474fd9e7f89644a7840e33e9df03dbaa4dd28bd
\ No newline at end of file
+925332c3d79f6252895ff1a367f795630619247e
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index f75c4b92b84d0f9b899d62ec9dd403225d1ea6c9..3fd0db3682315336e8ace8a8c439b09026ccb46d 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -2727,11 +2727,7 @@ int main(int argc, char **argv){
   }
   set_table_name(&data, 0);
   if( data.db ){
-    if( sqlite3_close(data.db)!=SQLITE_OK ){
-      fprintf(stderr,"Error: cannot close database \"%s\"\n",
-              sqlite3_errmsg(db));
-      rc++;
-    }
+    sqlite3_close(data.db);
   }
   return rc;
 }