Merge branch 'candidate-4.2.6' into closedown-4.2.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Community Edition 4.2.8-rc1 Release Candidate 1

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11901 CSV auto discovery generates wrong field names if
recordstructurepresent=false

Fix record structure generation.

Signed-off-by: Attila Vamos <attila.vamos@gmail.com>
Merge pull request #6232 from AttilaVamos/HPCC-11901-fix

HPCC-11901 CSV auto discovery generates wrong field names if recordstructurepresent=false

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11920 Prevent SKIPiness leaking outside an ONFAIL

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge branch 'candidate-4.2.6' into closedown-4.2.x

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'closedown-4.2.x' into candidate-4.2.8

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Community Edition 4.2.8-rc2 Release Candidate 2

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11932 Roxie attach causing Roxie cluster to load empty package

The onReconnect calls are supposed to reload from new information in dali, but
becuase of the isConnected being set AFTER the onReconnects, and the iniCache
happening before, the onReconnect was liable to reload from the empty cache
information.

The cache should not be cleared on reconnects (only needed on the initial
connect, and that can be handled more cleanly by calling loadCache in
writeCache). The isConnected needs to be set earlier - it was moved recently,
I believe just because it seemed like a good idea... Added a comment to
explain why it needs to be where it is.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #6254 from richardkchapman/roxie-losing-state

HPCC-11932 Roxie attach causing Roxie cluster to load empty package

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
HPCC-11932 Roxie attach causing Roxie cluster to load empty package

Better for writeCache to clear the cache if it does not exist - otherwise
cache file will never remove unwanted entries.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11940 Avoid multiple control:queries calls for same queryset

The code is backported from: https://github.com/hpcc-systems/
HPCC-Platform/pull/6158.

To get query status, the existing code does control:queries call
for each query. It takes a long time for WUListQueries. This
fix collects unique QuerySetIDs for all of the queries and calls
the control:queries for each unique QuerySetID. Then, set query
status for the queries which belong to the QuerySet.

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
Merge pull request #6263 from wangkx/h11940

HPCC-11940 Avoid multiple control:queries calls for same queryset

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Revert "HPCC-11901 CSV auto discovery generates wrong field names if recordstructurepresent=false"
Merge pull request #6264 from hpcc-systems/revert-6232-HPCC-11901-fix

Revert "HPCC-11901 CSV auto discovery generates wrong field names if rec...

Reviewed-By: Attila Vamos <attila.vamos@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #6255 from richardkchapman/roxie-losing-state

HPCC-11932 Roxie attach causing Roxie cluster to load empty package

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merge pull request #6241 from ghalliday/issue11920

HPCC-11920 Prevent SKIPiness leaking outside an ONFAIL

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC-11863 createReferencedFileList parameters in wrong position

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>