Add an assert() as an additional test for fix in check-in [523b42371122d9e1b3].

FossilOrigin-Name: f9e85e6c79162081f8f512d22951931a89d157a32b24afdc48b7eb865379abe7

diff --git a/manifest b/manifest
index 71cc36d6f92bc912f0a45aae8cef6b2a62c99f7d..e176159d4f84a9d7b32537318a9b3e1cb5c7f001 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\squery\sflattener\soptimization\sso\sthat\sit\spreserve\sthe\s"SF_Compound"\nbit\swhen\sflattening\sa\scompound\ssubquery\sinto\sa\snon-compound\souter\squery.\nFailure\sto\spreserve\sthat\sbit\scould\sallow\ssubsequent\sflattenings\swhich\sare\nnot\svalid.\sFix\sfor\sticket\s[c41afac34f15781fe09cd].
-D 2019-05-29T17:22:38.103
+C Add\san\sassert()\sas\san\sadditional\stest\sfor\sfix\sin\scheck-in\s[523b42371122d9e1b3].
+D 2019-05-29T18:33:59.635
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -522,7 +522,7 @@ F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c bae0a7562db77b02d87101b587819d5a5dcd8625e477d2d8a228a20bba4fead6
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
-F src/select.c 87ea2169d63a363a4ce5e2b9fa901c98126e5a57a5e865cb8e0032d8781d4b6f
+F src/select.c 9187f2c65744e975b191ccee49946732ee922f8bf40da998b322aca1633405ea
 F src/shell.c.in 6c992809abf20dbb4aad89299d7c15c98ddf2504b23c83ef71eb435ad392cdc3
 F src/sqlite.h.in d19c873a17c2effd4417f687fad942b6cc0ab0c64535f669cc2f22a5b05db23b
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1829,7 +1829,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 c736c40aab071a69bd5c5347b7c116d87ea3954019e967ca8ff7bdb4b518e5bf
-R 2c266512a1a06dffad446ef8f7479e2d
+P 523b42371122d9e1b3185425745f1490138bff7f7cc941ee26ee81df7ade5bf4
+R 02ac4619c1cd7611d095b6b080f57f2d
 U drh
-Z e14541c4ce7a69af488fec1ac8365e2a
+Z c74bccf839be69c4d3d35a14f921375f

diff --git a/manifest.uuid b/manifest.uuid
index 4be6010e5119c088bcdd2393c0be1b6924c8ed0d..9463b5aacc66aa3cd376f366feb89cd971f1af45 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-523b42371122d9e1b3185425745f1490138bff7f7cc941ee26ee81df7ade5bf4
\ No newline at end of file
+f9e85e6c79162081f8f512d22951931a89d157a32b24afdc48b7eb865379abe7
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 3091f17d4cd73a01ca579fd6762352c5ba596fe5..bd16acb0279347b1e25a529e976ea19e976981c4 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -2540,6 +2540,7 @@ static int multiSelect(
   */
   assert( p && p->pPrior );  /* Calling function guarantees this much */
   assert( (p->selFlags & SF_Recursive)==0 || p->op==TK_ALL || p->op==TK_UNION );
+  assert( p->selFlags & SF_Compound );
   db = pParse->db;
   pPrior = p->pPrior;
   dest = *pDest;