Merge branch 'candidate-7.4.x'

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

roxie/ccd/ccdserver.cpp

@@ -27590,9 +27590,28 @@ public:
             }
             for (unsigned i = 0; i < sinks.ordinality()-1; i++)
                 threads.item(i).start(parentExtractSize, parentExtract);
-            sinks.item(sinks.ordinality()-1).execute(parentExtractSize, parentExtract);
+            try
+            {
+                sinks.item(sinks.ordinality()-1).execute(parentExtractSize, parentExtract);
+            }
+            catch (IException *E)
+            {
+                noteException(E);
+                E->Release();
+            }
             for (unsigned i = 0; i < sinks.ordinality()-1; i++)
-                threads.item(i).join();
+            {
+                try
+                {
+                    threads.item(i).join();
+                }
+                catch (IException *E)
+                {
+                    noteException(E);
+                    E->Release();
+                }
+            }
+            checkAbort();
  #else
             class casyncfor: public CAsyncFor
             {

rtl/eclrtl/rtlkey.cpp

@@ -300,7 +300,7 @@ public:
         if (type.isNumeric())
             return out.append(size, text.getstr());
         else
-            return out.appendf("'%*s'", size, text.getstr());
+            return out.appendf("'%.*s'", size, text.getstr());
     }
 };