Disable an always-false test in the attach.c module. (CVS 6581)

FossilOrigin-Name: 92b69481bd0eedf06599c40623b38a6f4990010a

diff --git a/manifest b/manifest
index bc82d4627da61b23bf3f3c843e61517d861e2f4b..6a14c5a08ffdf8a89f3edc21d59330f71a96158f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\swith\sin-memory\ssub-journals\sand\sexclusive\slocking\smode.\sAlso\sa\stest\sscript\sproblem\sintroduced\sby\s(6575).\s(CVS\s6580)
-D 2009-04-30T16:41:00
+C Disable\san\salways-false\stest\sin\sthe\sattach.c\smodule.\s(CVS\s6581)
+D 2009-04-30T17:38:38
 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 5e4c387144503013963bac9c7b2f07e22bcbb3ee
+F src/attach.c 0342a96e6f7f0abf4fee8a407028d0fb1e0bf472
 F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
 F src/backup.c 0082d0e5a63f04e88faee0dff0a7d63d3e92a78d
 F src/bitvec.c ef370407e03440b0852d05024fb016b14a471d3d
@@ -726,7 +726,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 41f39c3145f2659fdb636cae07cdd424a10ac6e9
-R af3d649def4c08d27e9db23379bab6cd
-U danielk1977
-Z 5988bf8ceaa81fb5cf47ab98cac14b56
+P d67af3f5a21329e133aa6cf2be745a9f8c1a6562
+R 1053ef59038cf5f36f9be3b18c891400
+U drh
+Z f5c5a2a7db3916e075df663b238c5cc6

diff --git a/manifest.uuid b/manifest.uuid
index a0899d456525d8f456e593a004e55d07b07be5bc..ec868153c4954de1cb1099b64bf72e0f1dbd6ab6 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d67af3f5a21329e133aa6cf2be745a9f8c1a6562
\ No newline at end of file
+92b69481bd0eedf06599c40623b38a6f4990010a
\ No newline at end of file

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