From: drh <drh@noemail.net>
Date: Fri, 20 May 2016 13:44:58 +0000 (+0000)
Subject: Set the NULLEQ flag on the sequence counter comparison in the ORDER BY LIMIT
X-Git-Tag: version-3.14.0~157^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6326d9f6f14620a10b4254febcd5ae53f181e8f5;p=thirdparty%2Fsqlite.git

Set the NULLEQ flag on the sequence counter comparison in the ORDER BY LIMIT
optimization, to avoid coverage complaints about not testing the NULL case.

FossilOrigin-Name: ed1b30dc932a7c03e173b130c5f55f9989c7e0b4
---

diff --git a/manifest b/manifest
index 3f35f82e00..7eaabf0f13 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C A\sfew\ssimple\stest\scases\sfor\sthe\sORDER\sBY\sLIMIT\soptimization.
-D 2016-05-20T00:21:42.961
+C Set\sthe\sNULLEQ\sflag\son\sthe\ssequence\scounter\scomparison\sin\sthe\sORDER\sBY\sLIMIT\noptimization,\sto\savoid\scoverage\scomplaints\sabout\snot\stesting\sthe\sNULL\scase.
+D 2016-05-20T13:44:58.389
 F Makefile.in f59e0763ff448719fc1bd25513882b0567286317
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7
@@ -378,7 +378,7 @@ F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598
 F src/rowset.c 49eb91c588a2bab36647368e031dc5b66928149d
-F src/select.c 131eeddfcaf3777c4acd4727bf742b98af8183b5
+F src/select.c a0c4abf54bc6bd3a9c77a36ef3d1676045706cb2
 F src/shell.c 14ff7f660530a52b117d110ba3390b7b2eb719b6
 F src/sqlite.h.in 9984129d86243424b765fcb3f147c697bd20bb54
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1490,7 +1490,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 990fe50c9182f74c9b54a12602c4c30d891273e6
-R b3508f6593a9fbd22c3973de159c4a41
+P 08849eab0f6ef29eaf6d2ce9c692de9b953dbd27
+R 8c75a4632edf1c4d959356bd614336cd
 U drh
-Z 1bcf9218783f46102cc72fd7dcd4a1fb
+Z 54e2cd90f1a7f48806580b84bc51f48b
diff --git a/manifest.uuid b/manifest.uuid
index 277784dcaf..65694bee6c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-08849eab0f6ef29eaf6d2ce9c692de9b953dbd27
\ No newline at end of file
+ed1b30dc932a7c03e173b130c5f55f9989c7e0b4
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 080ccf3480..495d47e20b 100644
--- a/src/select.c
+++ b/src/select.c
@@ -611,6 +611,7 @@ static void pushOntoSorter(
       ** LIMIT+OFFSET entries of the sorter. */
       int iBrk = sqlite3VdbeCurrentAddr(v) + 2;
       sqlite3VdbeAddOp3(v, OP_Eq, regBase+nExpr, iBrk, r1);
+      sqlite3VdbeChangeP5(v, SQLITE_NULLEQ);
       VdbeCoverage(v);
     }
     sqlite3VdbeJumpHere(v, addr);