From: danielk1977 <danielk1977@noemail.net>
Date: Tue, 16 Jun 2009 04:35:39 +0000 (+0000)
Subject: Leave out a redundant line in build.c. Ticket #3916. (CVS 6766)
X-Git-Tag: cvs-to-fossil-cutover~206
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0d7d3a3315a78ee5aa76c17b9a2b872f2ec7e38e;p=thirdparty%2Fsqlite.git

Leave out a redundant line in build.c. Ticket #3916. (CVS 6766)

FossilOrigin-Name: d9f997aeb7a2195d0e16fe1555626918902b4f91
---

diff --git a/manifest b/manifest
index 06d8d160a3..67420de046 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sduplicate\sassert\sfrom\sbtree.c.\sTicket\s#3915.\s(CVS\s6765)
-D 2009-06-16T04:31:49
+C Leave\sout\sa\sredundant\sline\sin\sbuild.c.\sTicket\s#3916.\s(CVS\s6766)
+D 2009-06-16T04:35:39
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -109,7 +109,7 @@ F src/btmutex.c 9b899c0d8df3bd68f527b0afe03088321b696d3c
 F src/btree.c 081150263715e7a4d42d6fa1c5c246076cf24f58
 F src/btree.h f70b694e8c163227369a66863b01fbff9009f323
 F src/btreeInt.h df64030d632f8c8ac217ed52e8b6b3eacacb33a5
-F src/build.c 6c7b96103cebc558710ae72e2ce99b91c8ccd961
+F src/build.c 75b57e3f4de1b34d4e1e49d350dc87febff48ba0
 F src/callback.c 57359fa93de47c341b6b8ee504a88ff276397686
 F src/complete.c 5ad5c6cd4548211867c204c41a126d73a9fbcea0
 F src/date.c ab5f7137656652a48434d64f96bdcdc823bb23b3
@@ -734,7 +734,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P a49c2d4befcc33dd98543fe7b4d4f0bae56f1a90
-R b5b8f2dffb5405936d28de4c29456640
+P d89542cd8b2efaea7c6be6cd7787d183c55ae36a
+R 8bbc0f857fe07f0745566f5d0cea2bae
 U danielk1977
-Z 4402157b592d3b96762b57e696bd989d
+Z 1c5942565154441f8725e1d57fc36f0e
diff --git a/manifest.uuid b/manifest.uuid
index ff5cb7d1e9..33dc06de1d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d89542cd8b2efaea7c6be6cd7787d183c55ae36a
\ No newline at end of file
+d9f997aeb7a2195d0e16fe1555626918902b4f91
\ No newline at end of file
diff --git a/src/build.c b/src/build.c
index 04484afaff..a159ee43a4 100644
--- a/src/build.c
+++ b/src/build.c
@@ -22,7 +22,7 @@
 **     COMMIT
 **     ROLLBACK
 **
-** $Id: build.c,v 1.550 2009/06/11 00:47:21 drh Exp $
+** $Id: build.c,v 1.551 2009/06/16 04:35:39 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -1264,7 +1264,6 @@ CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char *zName){
     pColl = sqlite3GetCollSeq(db, pColl, zName);
     if( !pColl ){
       sqlite3ErrorMsg(pParse, "no such collation sequence: %s", zName);
-      pColl = 0;
     }
   }