diff --git a/manifest b/manifest index f379e65340..222b8aacbb 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improved\smatching\sof\sCOLLATE\sclauses\swithin\sthe\sON\sCONFLICT\sconflict-target. -D 2018-04-18T18:18:12.893 +C Fix\sa\stest\scase\sinside\sdistinct.test. +D 2018-04-18T18:19:25.251 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439 @@ -756,7 +756,7 @@ F test/descidx1.test 6d03b44c8538fe0eb4924e19fba10cdd8f3c9240 F test/descidx2.test 9f1a0c83fd57f8667c82310ca21b30a350888b5d F test/descidx3.test 09ddbe3f5295f482d2f8b687cf6db8bad7acd9a2 F test/diskfull.test 106391384780753ea6896b7b4f005d10e9866b6e -F test/distinct.test fd7cebccdeb87f561f49000914301dc896ee187aea5cdc2bae55e3d082374456 +F test/distinct.test a1783b960ad8c15a77cd9f207be072898db1026c F test/distinct2.test df0bb52b754661ea84ec9ff488d48913c97bd31d83ca17ce0bf1334645e660cf F test/distinctagg.test 1a6ef9c87a58669438fc771450d7a72577417376 F test/e_blobbytes.test 439a945953b35cb6948a552edaec4dc31fd70a05 @@ -1722,7 +1722,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 7ea08d0750dd9e07d2ffea336127034800db14aa23e60adec384d338871bf53a -R 434a68562af45a25f29ff21161feb7ed +P 8f4376e52b6124986937a3837ad83a18863c3144ef3b438a0d5e9231bf6c8980 +R c56b2d1a55a66b243d28d724ba692c63 U drh -Z b6eb3d8ec4f1858ff9bef1c9a2cc8590 +Z c48d320a1521f893c96f79a92bf02734 diff --git a/manifest.uuid b/manifest.uuid index f956dd0727..1319607d06 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -8f4376e52b6124986937a3837ad83a18863c3144ef3b438a0d5e9231bf6c8980 \ No newline at end of file +61cb8a391a0c709340ac60ffd0c58f950567892a8404c2bec7b9b1f64b3cc5cf \ No newline at end of file diff --git a/test/distinct.test b/test/distinct.test index 807fb0dd37..dac2269b0b 100644 --- a/test/distinct.test +++ b/test/distinct.test @@ -168,7 +168,7 @@ foreach {tn sql temptables res} { 6 "b FROM t1 ORDER BY +b COLLATE binary" {btree hash} {B b} 7 "a FROM t1" {} {A a} 8 "b COLLATE nocase FROM t1" {} {b} - 9 "b COLLATE nocase FROM t1 ORDER BY b COLLATE nocase" {} {B} + 9 "b COLLATE nocase FROM t1 ORDER BY b COLLATE nocase" {} {b} } { do_execsql_test 2.$tn.1 "SELECT DISTINCT $sql" $res do_temptables_test 2.$tn.2 "SELECT DISTINCT $sql" $temptables