From: dan <dan@noemail.net>
Date: Mon, 30 Mar 2015 09:58:38 +0000 (+0000)
Subject: Remove some unnecessary code from vdbesort.c.
X-Git-Tag: version-3.8.10~152^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2e1191929c9cdceebfcf46bcaf18d03ea4d47be;p=thirdparty%2Fsqlite.git

Remove some unnecessary code from vdbesort.c.

FossilOrigin-Name: b58191e91736b1d978db4127f22867dfe2302f7c
---

diff --git a/manifest b/manifest
index aba8fb17d1..a3ffa9b4e0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\soptimizations\sfor\ssorting\srecords\sthat\sbegin\swith\sinteger\sor\stext\svalues.
-D 2015-03-28T19:56:41.373
+C Remove\ssome\sunnecessary\scode\sfrom\svdbesort.c.
+D 2015-03-30T09:58:38.613
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -300,7 +300,7 @@ F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
 F src/vdbeaux.c 413dc496248ac18eb0c19e35e86bb1ffd47b8907
 F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
 F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
-F src/vdbesort.c b3d16bbd66ff8d26b42670a8aa5dfda0e0d2e45e
+F src/vdbesort.c f283b28d9d1bbaf9c4467c1275ab2146ed868ec9
 F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
 F src/vtab.c 62d49237bd8f3be4863815a39387b0f9897fa5e1
 F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
@@ -1247,7 +1247,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P ce5ad17c25cf2f8274ce304c51e4421faae0b32b
-R 5a4cff4b803c75214d0e7f89bc9331f1
+P 24fe9f25d64ee516633fed1ae7ebc21554aa69ca
+R 7cd5cef35d63d5a82a586382f49d8e50
 U dan
-Z 8e7d5cc07144236ce8ed9e6cb6b634d0
+Z 51fc974a93f39baea754c6fb429251e1
diff --git a/manifest.uuid b/manifest.uuid
index 1d45093594..698dbf4147 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-24fe9f25d64ee516633fed1ae7ebc21554aa69ca
\ No newline at end of file
+b58191e91736b1d978db4127f22867dfe2302f7c
\ No newline at end of file
diff --git a/src/vdbesort.c b/src/vdbesort.c
index b8ef783a06..b6483b9ee7 100644
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -1305,13 +1305,6 @@ static int vdbeSortAllocUnpacked(SortSubtask *pTask){
     if( pFree==0 ) return SQLITE_NOMEM;
     pTask->pUnpacked->nField = pTask->pSorter->pKeyInfo->nField;
     pTask->pUnpacked->errCode = 0;
-    if( pTask->pSorter->pKeyInfo->aSortOrder[0] ){
-      pTask->pUnpacked->r1 = 1;
-      pTask->pUnpacked->r2 = -1;
-    }else{
-      pTask->pUnpacked->r1 = -1;
-      pTask->pUnpacked->r2 = 1;
-    }
   }
   return SQLITE_OK;
 }