Make sure to do a clean shutdown of the library upon existing the shell

in order to remove WAL files.

FossilOrigin-Name: c1762dda00b8bdb7c3247617ac4cb654f1d95cf7
This commit is contained in:
drh 2010-05-06 20:19:55 +00:00
parent fb4a626da0
commit 72af0774f9
3 changed files with 14 additions and 14 deletions

View File

@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
C Exclude\sall\sWAL\stests\sfrom\sthe\sjournaltest\spermutation.
D 2010-05-06T19:55:57
C Make\ssure\sto\sdo\sa\sclean\sshutdown\sof\sthe\slibrary\supon\sexisting\sthe\sshell\nin\sorder\sto\sremove\sWAL\sfiles.
D 2010-05-06T20:19:55
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -170,7 +170,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
F src/resolve.c ac5f1a713cd1ae77f08b83cc69581e11bf5ae6f9
F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
F src/select.c c03d8a0565febcde8c6a12c5d77d065fddae889b
F src/shell.c c40427c7245535a04a9cb4a417b6cc05c022e6a4
F src/shell.c fd4ccdb37c3b68de0623eb938a649e0990710714
F src/sqlite.h.in c68d5a6c13c04812b2873bb93d2132d1f5d3ccf8
F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
F src/sqliteInt.h 9819b45610abeca390176243a9a31758c1f0ac7a
@ -816,14 +816,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 32a8501d78714cc390eba5f993f329ef3b499878
R 3fadeaa9f525cb7a9f2d679155ce38fe
P 46c97d7eee9359cd21139a6520633f5d16594ab0
R 5978ea6047e61a8c5d5eefc062bfc27e
U drh
Z c4d16a89fa63b297a45a15f873d36d98
Z f8884cbb9472df8af02e07da6b6f14c2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFL4x7QoxKgR168RlERAq76AJ90687cFDYfeinP9JsMERA+feufKwCfWI/B
YD5LnNX4eEEbV7FlK2e9d0g=
=2s20
iD8DBQFL4yRuoxKgR168RlERAhJ3AJ9qm9dkkX0xAZrifiRC1ZueJrYmQACfSpal
9+UI3fFuQTlf5lpb20sxzJQ=
=8XiD
-----END PGP SIGNATURE-----

View File

@ -1 +1 @@
46c97d7eee9359cd21139a6520633f5d16594ab0
c1762dda00b8bdb7c3247617ac4cb654f1d95cf7

View File

@ -2578,7 +2578,6 @@ int main(int argc, char **argv){
*/
if( zFirstCmd[0]=='.' ){
rc = do_meta_command(zFirstCmd, &data);
return rc;
}else{
open_db(&data);
rc = shell_exec(data.db, zFirstCmd, shell_callback, &data, &zErrMsg);
@ -2625,9 +2624,10 @@ int main(int argc, char **argv){
}
}
set_table_name(&data, 0);
if( db ){
if( sqlite3_close(db)!=SQLITE_OK ){
fprintf(stderr,"Error: cannot close database \"%s\"\n", sqlite3_errmsg(db));
if( data.db ){
if( sqlite3_close(data.db)!=SQLITE_OK ){
fprintf(stderr,"Error: cannot close database \"%s\"\n",
sqlite3_errmsg(db));
rc++;
}
}