diff --git a/manifest b/manifest
index 3272cab2e2..9ff6553992 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sthe\sHAVING-to-WHERE\soptimization.\s\sThe\scode\suses\sless\sspace\nand\sless\sCPU,\sand\sthere\sis\snow\s".selecttrace"\soutput.
-D 2018-03-20T18:08:33.634
+C Fix\sincorrect\stestcase\slabels\son\stwo\scases\sin\sjoin5.test.\s\sNo\schanges\sto\scode.
+D 2018-03-20T19:02:03.726
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -1007,7 +1007,7 @@ F test/join.test 442c462eea85cf065d70a663c626b780a95af6e11585d909bb63b87598afe67
 F test/join2.test f1b5ba94ba70a791df2d99e61adcebf62edacad1eca57881c97eb3e2ca718595
 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
-F test/join5.test bc98ea4b4e5003f5b1453701ebb8cd7d1c01a550
+F test/join5.test c6bd62effc37a152bea735f9ef241b19bb967bd4593dc99b20e2fc55ae707e38
 F test/join6.test cfe6503791ceb0cbb509966740286ec423cbf10b
 F test/journal1.test c7b768041b7f494471531e17abc2f4f5ebf9e5096984f43ed17c4eb80ba34497
 F test/journal2.test 9dac6b4ba0ca79c3b21446bbae993a462c2397c4
@@ -1712,7 +1712,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 b36caeca91647616ac2ccdb281200c1a8bcd15d1f30dda0c1d89440d54607196
-R 8c8ba3697adfaee222e4b3bf5fcfea0c
+P 5ad668d4339397fe66fe085e0527e37a1930917da88d462a8d89a465faa15e28
+R de2d87ae55e8927dcebc8ba7daa8abff
 U drh
-Z 2c3bb9ba5e9ef9c236ac01dacb11a7b0
+Z 13d930ad372c9908126067c6c04be90c
diff --git a/manifest.uuid b/manifest.uuid
index a89f26e2b2..a2eb17097c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5ad668d4339397fe66fe085e0527e37a1930917da88d462a8d89a465faa15e28
\ No newline at end of file
+4661ac81c9589b06a07df8b7931fbd0a7f9a4e9ba1448192b70701dc85a29bd2
\ No newline at end of file
diff --git a/test/join5.test b/test/join5.test
index 352ffd40a6..c2bf1e3f6a 100644
--- a/test/join5.test
+++ b/test/join5.test
@@ -164,7 +164,7 @@ do_execsql_test join5-3.3 {
 # Ticket https://www.sqlite.org/src/tktview/c2a19d81652f40568c770c43 on
 # 2015-08-20.  LEFT JOIN and the push-down optimization.
 #
-do_execsql_test join6-4.1 {
+do_execsql_test join5-4.1 {
   SELECT *
   FROM (
       SELECT 'apple' fruit
@@ -178,7 +178,7 @@ do_execsql_test join6-4.1 {
       SELECT 1 isyellow
   ) c ON b.fruit='banana';
 } {apple apple {} banana banana 1}
-do_execsql_test join6-4.2 {
+do_execsql_test join5-4.2 {
   SELECT *
     FROM (SELECT 'apple' fruit UNION ALL SELECT 'banana')
          LEFT JOIN (SELECT 1) ON fruit='banana';