Merge branch 'candidate-5.0.6' into candidate-5.2.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

ecl/hqlcpp/hqlresource.cpp

@@ -5357,7 +5357,11 @@ IHqlExpression * EclResourcer::createResourced(IHqlExpression * expr, ResourceGr
         {
             if (!source->isAction())
             {
-                source = createDatasetF(no_split, source, createAttribute(balancedAtom), createUniqueId(), NULL);
+                if (source->isDataset())
+                    source = createDatasetF(no_split, source, createAttribute(balancedAtom), createUniqueId(), NULL);
+                else
+                    source = createRowF(no_split, source, createAttribute(balancedAtom), createUniqueId(), NULL);
+
                 ownerGraph->addSharedInput(expr->queryBody(), source);
             }
         }