Merge branch 'candidate-6.2.8' into candidate-6.2.10

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

docs/ECLProgrammersGuide/PRG_Mods/PrG_Workwith_Blobs.xml

@@ -23,8 +23,9 @@
     <para>In the HPCCClientTools.PDF there is a chapter devoted to the
     DFUplus.exe program. This is a command line tool with specific options
     that allow you to spray and despray files into BLOBs in the HPCC. In all
-    the examples below, we'll assume you have a DFUPLUS.INI file in the same folder as the executable containing
-    the standard content described in that section of the PDF.</para>
+    the examples below, we'll assume you have a DFUPLUS.INI file in the same
+    folder as the executable containing the standard content described in that
+    section of the PDF.</para>
 
     <para>The key to making a spray operation write to BLOBs is the use of the
     <emphasis>prefix=Filename,Filesize</emphasis> option. For example, the
@@ -35,6 +36,14 @@
     <programlisting>C:\&gt;dfuplus action=spray srcip=10.150.51.26 srcfile=c:\import\*.jpg,c:\import\*.bmp 
             dstcluster=le_thor dstname=LE::imagedb overwrite=1 
             PREFIX=FILENAME,FILESIZE nosplit=1</programlisting>
+
+    <para>When using the wildcard characters (* and ?) to spray multiple
+    source files (<emphasis>srcfile</emphasis>) to a single
+    <emphasis>dstname</emphasis>, you MUST use both the
+    <emphasis>filename</emphasis> and <emphasis>filesize</emphasis>
+    (FILENAME,FILESIZE) options if you need to be able to despray the contents
+    of each record in the <emphasis>dstname</emphasis> back to the multiple
+    source files they originally came from. </para>
   </sect2>
 
   <sect2 id="Working_with_BLOB_Data">

docs/HPCCClientTools/CT_Mods/CT_Comm_Line_DFU.xml

@@ -25,8 +25,7 @@
       <title>Command Line Interface</title>
 
       <sect2 id="DFUPlusexe">
-        <title><emphasis
-        role="bold">dfuplus</emphasis><emphasis></emphasis><emphasis
+        <title><emphasis role="bold">dfuplus </emphasis><emphasis
         role="bold">[--version] action=</emphasis><emphasis>operation
         </emphasis><emphasis
         role="bold">[</emphasis><emphasis>@filename</emphasis><emphasis
@@ -408,7 +407,14 @@ replicate=1</programlisting>
                     endian) and the size of integer to contain it (<emphasis
                     role="bold">1</emphasis> to <emphasis
                     role="bold">8</emphasis> bytes). If format and size are
-                    omitted, the default is L4.</entry>
+                    omitted, the default is L4. <para>When using wildcard
+                    characters (* and ?) to spray multiple source files
+                    (srcfile) to a single dstname, you MUST use both the
+                    filename and filesize options if you need to be able to
+                    despray the contents of each record in the dstname back to
+                    the multiple source files they originally came from. If
+                    you never need to do that, then the filesize option may be
+                    omitted. </para></entry>
                   </row>
 
                   <row>
@@ -648,7 +654,13 @@ END;</programlisting>
                   <entry>Uses the prepended size of the file (see the
                   <emphasis>prefix</emphasis> option to the spray
                   <emphasis>operation</emphasis>) to split out the data into
-                  separate files.</entry>
+                  separate files.<para>When using wildcard characters (* and
+                  ?) to spray multiple source files (srcfile) to a single
+                  dstname, you MUST use both the filename and filesize options
+                  if you need to be able to despray the contents of each
+                  record in the dstname back to the multiple source files they
+                  originally came from. If you never need to do that, then the
+                  filesize option may be omitted. </para></entry>
                 </row>
               </tbody>
             </tgroup>

ecl/hql/hqlutil.cpp

@@ -8588,7 +8588,7 @@ bool ConstantRowCreator::processFieldValue(IHqlExpression * optLhs, ITypeInfo *
                     case no_null:
                     {
                         rtlWriteSize32t(out.reserve(sizeof(size32_t)), 0);
-                        break;
+                        return true;
                     }
                     case no_inlinetable:
                     {

version.cmake

@@ -5,6 +5,7 @@ set ( HPCC_PROJECT "community" )
 set ( HPCC_MAJOR 6 )
 
 set ( HPCC_MINOR 2 )
+
 set ( HPCC_POINT 9 )
 set ( HPCC_MATURITY "closedown" )
 set ( HPCC_SEQUENCE 0 )