Merge branch 'candidate-6.2.12' into candidate-6.4.0

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

rtl/eclrtl/eclrtl.cpp

@@ -4878,9 +4878,9 @@ ECLRTL_API void rtlConcatUtf8(unsigned & tlen, char * * tgt, ...)
         unsigned len = va_arg(args, unsigned);
         if(len+1==0)
             break;
+        const char * str = va_arg(args, const char *);
         if (len)
         {
-            const char * str = va_arg(args, const char *);
             rtlUtf8ToUnicode(len, next.getustr(), len, str);
             idx = unorm_concatenate(result.getustr(), idx, next.getustr(), len, result.getustr(), totalLength, UNORM_NFC, 0, &err);
         }

testing/regress/ecl/key/unicodeconcat.xml

@@ -1,3 +1,6 @@
 <Dataset name='unicode_empty_string'>
  <Row><unicode_empty_string>startend</unicode_empty_string></Row>
 </Dataset>
+<Dataset name='unicode_empty_string8'>
+ <Row><unicode_empty_string8>true</unicode_empty_string8></Row>
+</Dataset>

testing/regress/ecl/unicodeconcat.ecl

@@ -10,3 +10,9 @@ output(s + m + e, named('unicode_empty_string'));
 
 
 
+utf8 s8 := nofold((utf8)s);
+utf8 m8 := nofold(trim(nofold(u8'   ')));
+utf8 e8 := nofold((utf8)e);
+
+output(s8 + m8 + e8 = u8'startend', named('unicode_empty_string8'));
+

thorlcr/activities/merge/thmergeslave.cpp

@@ -127,9 +127,9 @@ public:
 
     class cProvider: public Thread
     {
-        mptag_t tag;
-        GlobalMergeSlaveActivity *parent;
-        bool stopped;
+        mptag_t tag = TAG_NULL;
+        GlobalMergeSlaveActivity *parent = nullptr;
+        bool stopped = true;
         Linked<IOutputRowSerializer> serializer;
     public:
         void init(GlobalMergeSlaveActivity *_parent, IOutputRowSerializer *_serializer,mptag_t _tag)

version.cmake

@@ -3,6 +3,7 @@
 ###
 set ( HPCC_PROJECT "community" )
 set ( HPCC_MAJOR 6 )
+
 set ( HPCC_MINOR 3 )
 set ( HPCC_POINT 0 )
 set ( HPCC_MATURITY "trunk" )