- Include last source modifs

modified:
  storage/connect/filamtxt.cpp
  storage/connect/ha_connect.cc
  storage/connect/tabxml.cpp

storage/connect/filamtxt.cpp

@@ -934,7 +934,8 @@ int DOSFAM::RenameTempFile(PGLOBAL g)
   // This loop is necessary because, in case of join,
   // To_File can have been open several times.
   for (PFBLOCK fb = PlgGetUser(g)->Openlist; fb; fb = fb->Next)
-    rc = PlugCloseFile(g, fb);
+    if (fb == To_Fb || fb == To_Fbt)
+      rc = PlugCloseFile(g, fb);
 
   tempname = (char*)To_Fbt->Fname;
   PlugSetPath(filename, To_File, Tdbp->GetPath());

storage/connect/tabxml.cpp

@@ -1326,14 +1326,11 @@ void XMLCOL::WriteColumn(PGLOBAL g)
   if (Value != To_Val)
     Value->SetValue_pval(To_Val, false);    // Convert the updated value
 
-  if (Value->IsNull())
-    return;
-
   /*********************************************************************/
   /*  If a check pass was done while updating, all node contruction    */
   /*  has been already one.                                            */
   /*********************************************************************/
-  if (Status && Tdbp->Checked) {
+  if (Status && Tdbp->Checked && !Value->IsNull()) {
     assert (ColNode != NULL);
     assert ((Type ? (void *)ValNode : (void *)AttNode) != NULL);
     goto fin;
@@ -1346,6 +1343,12 @@ void XMLCOL::WriteColumn(PGLOBAL g)
   if (Tdbp->CheckRow(g, Nod || Tdbp->Colname))
     longjmp(g->jumper[g->jump_level], TYPE_AM_XML);
 
+  /*********************************************************************/
+  /*  Null values are represented by no node.                          */
+  /*********************************************************************/
+  if (Value->IsNull())
+    return;
+
   /*********************************************************************/
   /*  Find the column and value nodes to update or insert.             */
   /*********************************************************************/