diff --git a/manifest b/manifest index f9c9822d56..0e8a89805b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Widen\sthe\sopcode\scolumn\sof\sexplain\soutput\sin\sthe\sshell.\s(CVS\s2625) -D 2005-08-27T01:50:54 +C Do\snot\schange\sfields\sof\sstale\ssqlite3\shandles.\s\sTicket\s#1384.\s(CVS\s2626) +D 2005-08-27T01:51:44 F Makefile.in 87717916c787099d5a9a64f7a2acc188b4bbcadd F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -78,7 +78,7 @@ F src/tokenize.c e1faf5637f3f4f90933785a0ecf64595f3ac3530 F src/trigger.c f51dec15921629591cb98bf2e350018e268b109a F src/update.c a9d2c5f504212d62da1b094476f1389c0e02f83f F src/utf.c bda5eb85039ef16f2d17004c1e18c96e1ab0a80c -F src/util.c f4678297585c69811724468554393b898548e9c6 +F src/util.c 5650f6fe5ee30e0678985ad7b94da91e3f85752b F src/vacuum.c 829d9e1a6d7c094b80e0899686670932eafd768c F src/vdbe.c 69f33e22c7d0a64b23fbb69e6da95a1bb6869032 F src/vdbe.h 3b29a9af6c7a64ed692bef1fc5f61338f40d2f67 @@ -298,7 +298,7 @@ F www/tclsqlite.tcl 3df553505b6efcad08f91e9b975deb2e6c9bb955 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P fc9e04609b6968fc5039a6f9f808aac681f4fc41 -R 5ac7de5aa63d911385908b28b345c00b +P dd3b00aa0bf3b847b0b2f20f6df60d4e3a2d81df +R 0caa6188908a061a0b5bcc31c4f3d956 U drh -Z 1528f9fa0f2ffa2b725ac3031fce29f6 +Z 40d0cacfc441f741b442a273e16b3c7d diff --git a/manifest.uuid b/manifest.uuid index 662ac5869b..6605534ec2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -dd3b00aa0bf3b847b0b2f20f6df60d4e3a2d81df \ No newline at end of file +7e05b7ca0ce72b1c6125196f4b21bbb676bc488c \ No newline at end of file diff --git a/src/util.c b/src/util.c index 53748cd211..58fe0fb58a 100644 --- a/src/util.c +++ b/src/util.c @@ -14,7 +14,7 @@ ** This file contains functions for allocating memory, comparing ** strings, and stuff like that. ** -** $Id: util.c,v 1.143 2005/08/20 03:03:04 drh Exp $ +** $Id: util.c,v 1.144 2005/08/27 01:51:44 drh Exp $ */ #include "sqliteInt.h" #include <stdarg.h> @@ -748,7 +748,7 @@ int sqlite3SafetyOn(sqlite3 *db){ if( db->magic==SQLITE_MAGIC_OPEN ){ db->magic = SQLITE_MAGIC_BUSY; return 0; - }else if( db->magic==SQLITE_MAGIC_BUSY || db->magic==SQLITE_MAGIC_ERROR ){ + }else if( db->magic==SQLITE_MAGIC_BUSY ){ db->magic = SQLITE_MAGIC_ERROR; db->flags |= SQLITE_Interrupt; } @@ -764,7 +764,7 @@ int sqlite3SafetyOff(sqlite3 *db){ if( db->magic==SQLITE_MAGIC_BUSY ){ db->magic = SQLITE_MAGIC_OPEN; return 0; - }else if( db->magic==SQLITE_MAGIC_OPEN || db->magic==SQLITE_MAGIC_ERROR ){ + }else if( db->magic==SQLITE_MAGIC_OPEN ){ db->magic = SQLITE_MAGIC_ERROR; db->flags |= SQLITE_Interrupt; }