Merge all the latest enhancements from trunk.

FossilOrigin-Name: 924f471291dfd458307a11819aa640cc1a02ac63

1 files changed, 7 insertions, 0 deletions

diff --git a/src/resolve.c b/src/resolve.c
index 27eba9fd0..fd57fd702 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1331,6 +1331,13 @@ static int resolveSelectStep(Walker *pWalker, Select *p){
       }
     }
 
+    /* If this is part of a compound SELECT, check that it has the right
+    ** number of expressions in the select list. */
+    if( p->pNext && p->pEList->nExpr!=p->pNext->pEList->nExpr ){
+      sqlite3SelectWrongNumTermsError(pParse, p->pNext);
+      return WRC_Abort;
+    }
+
     /* Advance to the next term of the compound
     */
     p = p->pPrior;