From: dan <dan@noemail.net>
Date: Fri, 2 May 2014 16:03:57 +0000 (+0000)
Subject: Remove a faulty assert() from vdbesort.c.
X-Git-Tag: version-3.8.7~132^2~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=012e133772cec1e77fb132eab406d0af0ad636c9;p=thirdparty%2Fsqlite.git

Remove a faulty assert() from vdbesort.c.

FossilOrigin-Name: d95d68aa1d14b750888d50068380cc107f9070df
---

diff --git a/manifest b/manifest
index b71dec8c60..07d5ceadf1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\scomments.\s\sStore\ssome\sextra\sinformation\sin\sSqliteThread\sthat\nis\suseful\sfor\sdebugging.
-D 2014-04-24T12:28:28.628
+C Remove\sa\sfaulty\sassert()\sfrom\svdbesort.c.
+D 2014-05-02T16:03:57.598
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in ad0921c4b2780d01868cf69b419a4f102308d125
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -286,7 +286,7 @@ F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 F src/vdbeaux.c 8289ed68e2262844334461ccb1b91c4d55b29b0b
 F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
 F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
-F src/vdbesort.c 2b13026e5d4afa4737a312715aa1cd7e2f4d07c2
+F src/vdbesort.c 0095545ae3786d00c9104d036f5d092953a1e2d3
 F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
 F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@ -1165,7 +1165,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P e2c9f71a451e44040624b9f255b4510743513019
-R 85ab93c26e2f3dfc5f24d719f3aa0846
-U drh
-Z 26e90d38e785197a28b1e4097f1c9b04
+P 9fb5e212089d85cdd3b4787dd69c72e6d84560b6
+R ee91b52dc43b32be4c405d028722e931
+U dan
+Z 8b01b62c4d596e9ee4b370ddc9560981
diff --git a/manifest.uuid b/manifest.uuid
index 6ee6407693..89f9d98d45 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9fb5e212089d85cdd3b4787dd69c72e6d84560b6
\ No newline at end of file
+d95d68aa1d14b750888d50068380cc107f9070df
\ No newline at end of file
diff --git a/src/vdbesort.c b/src/vdbesort.c
index 46de735284..daf2477532 100644
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -1900,7 +1900,6 @@ static int vdbePmaReaderIncrInit(PmaReader *pIter, int eMode){
     SortSubtask *pTask = pIncr->pTask;
     sqlite3 *db = pTask->pSorter->db;
 
-    assert( eMode==INCRINIT_NORMAL || pIncr->bUseThread==1 );
     rc = vdbeIncrInitMerger(pTask, pIncr->pMerger, eMode);
 
     /* Set up the required files for pIncr. A multi-theaded IncrMerge object