Early-out on the INTERSECT query processing following an error.

FossilOrigin-Name: a67cf5b7d37d5b1484be32092635faafd8f76e5881898cd9435517c4b287d663

diff --git a/manifest b/manifest
index c04bd35f1aee3dd872de1f41ba4803a07b517021..f317c1c42a5d2592744558d3872979c443de64a3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\spotential\sNULL\spointer\sdereference\sfollowing\sOOM.\s\sProblem\sdiscovered\nby\sdbsqlfuzz.\s\sTest\scase\sin\sTH3.
-D 2020-02-19T15:39:46.936
+C Early-out\son\sthe\sINTERSECT\squery\sprocessing\sfollowing\san\serror.
+D 2020-02-20T14:08:51.305
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -531,7 +531,7 @@ F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 38e3a5636f5bdc92e3683e4cafbba6418c0aa15e0d89ca5b28bd0b621dbb80bf
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
-F src/select.c 9e5b357f1c0952ff699effe3640be58a7e16497be6b74a2637495f5ef13859f0
+F src/select.c 59ba85dce4c0ffb88fcda66b0c6c94b9a15f0fc30a3c454261468bd7e9063627
 F src/shell.c.in c2e20c43a44fb5588a6c27ce60589538fbf4794fd7686f5b2598eca22eaae1fa
 F src/sqlite.h.in 802957feeb249ede54f8dfe99b72aa19e70a0b7737969c46e625dc2f9f2d42b0
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1858,7 +1858,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 ee034fe916448e953ee7824e5c0db99a36a0ad138ebfb25f751bf84cb80a8fa7
-R 2a8847f9c82a11b506ee531f16ba829e
+P 5aeb5a2d295e10d5fc1d456b3acaf8ac13c04cb5bb71a8c4571541d366e95887
+R e16a245c08b1d334873515473145c2a9
 U drh
-Z 3d267f9a5c83ad9967ac22844ce82b39
+Z de8f43e65e8ffd2358ef87b9dc3ccd7d

diff --git a/manifest.uuid b/manifest.uuid
index 7badba80a50572f4cee24501f407b11dc408ab55..9b7e90f43f0a9e3bbe22f48610e6ad13054a316d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5aeb5a2d295e10d5fc1d456b3acaf8ac13c04cb5bb71a8c4571541d366e95887
\ No newline at end of file
+a67cf5b7d37d5b1484be32092635faafd8f76e5881898cd9435517c4b287d663
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index d03322fcb2c24b368a17c870d7c047707830ec43..0f38c806c4e2bd9a085a32896845e3f9f782c91b 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -2806,6 +2806,7 @@ static int multiSelect(
         /* Generate code to take the intersection of the two temporary
         ** tables.
         */
+        if( rc ) break;
         assert( p->pEList );
         iBreak = sqlite3VdbeMakeLabel(pParse);
         iCont = sqlite3VdbeMakeLabel(pParse);