diff --git a/manifest b/manifest index 195371ca68..cc1fcc66d5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Check\sfor\smultiple\scalls\sto\ssqlite3FailedMalloc().\sIgnore\sthe\ssecond\sand\ssubsequent\scalls.\s(CVS\s3691) -D 2007-03-15T15:33:32 +C Save\san\sif(...)\sclause\smade\sredundant\sby\s(3691).\s(CVS\s3692) +D 2007-03-15T15:35:29 F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -56,7 +56,7 @@ F sqlite3.def a96c1d0d39362b763d2ddba220a32da41a15c4b4 F sqlite3.pc.in 985b9bf34192a549d7d370e0f0b6b34a4f61369a F src/alter.c 2c79ec40f65e33deaf90ca493422c74586e481a3 F src/analyze.c 7d2b7ab9a9c2fd6e55700f69064dfdd3e36d7a8a -F src/attach.c b11eb4d5d3fb99a10a626956bccc7215f6b68b16 +F src/attach.c fd286a9140a2df84b1482f052b67ff5fad9569a1 F src/auth.c 902f4722661c796b97f007d9606bd7529c02597f F src/btree.c f5c1b3d88ad62ab4682de37229168a00b87fc948 F src/btree.h 066444ee25bd6e6accb997bfd2cf5ace14dbcd00 @@ -436,7 +436,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P ea8507a796c65041f7e720edea89f919fca1a028 -R 5d29b4be7fb44760716828c670d395c7 +P 7180874592ffcaf8e2fe3c3b6b37449654da709b +R 719cc995cbd8893611545d757a98e68f U danielk1977 -Z 0e4277c09968dc77bec9f859c249a52e +Z 8386e34fed8da2b1d9cd079c24880e75 diff --git a/manifest.uuid b/manifest.uuid index 8639cf206c..b59dfe2780 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7180874592ffcaf8e2fe3c3b6b37449654da709b \ No newline at end of file +8153edf8bea51b9344de1b700482879190f86fb4 \ No newline at end of file diff --git a/src/attach.c b/src/attach.c index 8e5442991b..0a50b374d9 100644 --- a/src/attach.c +++ b/src/attach.c @@ -11,7 +11,7 @@ ************************************************************************* ** This file contains code used to implement the ATTACH and DETACH commands. ** -** $Id: attach.c,v 1.53 2006/06/27 16:34:57 danielk1977 Exp $ +** $Id: attach.c,v 1.54 2007/03/15 15:35:29 danielk1977 Exp $ */ #include "sqliteInt.h" @@ -188,7 +188,7 @@ static void attachFunc( sqlite3ResetInternalSchema(db, 0); db->nDb = iDb; if( rc==SQLITE_NOMEM ){ - if( !sqlite3MallocFailed() ) sqlite3FailedMalloc(); + sqlite3FailedMalloc(); sqlite3_snprintf(sizeof(zErr),zErr, "out of memory"); }else{ sqlite3_snprintf(sizeof(zErr),zErr, "unable to open database: %s", zFile);