Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-9201 Short circuit parameter substitution

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #4308 from ghalliday/issue9201

HPCC-9201 Short circuit parameter substitution

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-9076 Treat scope-independent filters the same as IF conditions

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #4322 from ghalliday/issue9076

HPCC-9076 Treat scope-independent filters the same as IF conditions

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-9229 Introduce a Array::swapWith(Array & other) member

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #4325 from ghalliday/issue9229

HPCC-9229 Introduce a Array::swapWith(Array & other) member

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-9171 Fix assert(original) caused by implicit project changes

If a nested row had fields removed from it, and that row was referenced
from a TABLE() operator, it was possible for the selects to become out of sync
with the record, causing an internal error.

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge remote-tracking branch 'origin/candidate-4.0.0' into closedown-4.0.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-9199 Invalid params to control:querystats are not reported

Extend mergestats capabilities to include exceptions.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #4338 from richardkchapman/mergestats_exception

HPCC-9199 Invalid params to control:querystats are not reported

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
HPCC-9229 Fix build break on more modern compilers

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>