Remove a NEVER() clause from a condition that is true at least once when running...

FossilOrigin-Name: 514efc7312d725c3fe35741e8c000526f3bdb3a6

diff --git a/manifest b/manifest
index 00df09656706f4d33d1ceefe5760619a4aa5e9c5..995154da6d6ded4981f3dc2ee5178920ea9b954a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sfor\stempdb.test\sso\sthat\sit\spasses\swhen\srunning\sthe\sinmemory_journal\spermutation\stest.\s(CVS\s6584)
-D 2009-05-01T05:23:18
+C Remove\sa\sNEVER()\sclause\sfrom\sa\scondition\sthat\sis\strue\sat\sleast\sonce\swhen\srunning\sattachmalloc.test.\s(CVS\s6585)
+D 2009-05-01T06:19:21
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -101,7 +101,7 @@ F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
 F src/alter.c 8ab5824bde0a03dae5829f61557ab7c72757000a
 F src/analyze.c e239496cfb5394ac8867f1c112905ddab8d01cd9
-F src/attach.c 0342a96e6f7f0abf4fee8a407028d0fb1e0bf472
+F src/attach.c 3b99611f04926fc69c35b1145603fc3ddb0ca967
 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
 F src/backup.c 0082d0e5a63f04e88faee0dff0a7d63d3e92a78d
 F src/bitvec.c ef370407e03440b0852d05024fb016b14a471d3d
@@ -727,7 +727,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 4a1f6a3a9ac8b476c86edac83b555adeef0be4e6
-R 65a593621f683dfa20f7e183c2f4a8a5
+P 0256187b512c5849ffae0644e6a42ec0ca2de894
+R 0d590a65bc1ea31caaa79e6209b36379
 U danielk1977
-Z e7ea26bff8cc48ee908296e3b27e1961
+Z 860108b246a9233ecd454fc67c77b178

diff --git a/manifest.uuid b/manifest.uuid
index 40802211e82d310fcb4d736ec8a1db502572d28a..0d73204917ef51d799db9bc72dba49f55b1a2d50 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0256187b512c5849ffae0644e6a42ec0ca2de894
\ No newline at end of file
+514efc7312d725c3fe35741e8c000526f3bdb3a6
\ No newline at end of file

diff --git a/src/attach.c b/src/attach.c
index ba11208dfd7c137031ff71e28a3e2fdc169acd71..c635645d6392ed56777ad66f4045bc20d15b8cf5 100644 (file)
--- 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.89 2009/04/30 17:38:38 drh Exp $
+** $Id: attach.c,v 1.90 2009/05/01 06:19:21 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -202,7 +202,7 @@ static void attachFunc(
     }
     sqlite3ResetInternalSchema(db, 0);
     db->nDb = iDb;
-    if( rc==SQLITE_NOMEM || NEVER(rc==SQLITE_IOERR_NOMEM) ){
+    if( rc==SQLITE_NOMEM || rc==SQLITE_IOERR_NOMEM ){
       db->mallocFailed = 1;
       sqlite3DbFree(db, zErrDyn);
       zErrDyn = sqlite3MPrintf(db, "out of memory");