- Fix bug MDEV-5928

modified:
  storage/connect/tabxml.cpp

1 files changed, 7 insertions, 4 deletions

diff --git a/storage/connect/tabxml.cpp b/storage/connect/tabxml.cpp
index 7a2c0169c2b..77dc7617e8a 100644
--- a/storage/connect/tabxml.cpp
+++ b/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;
@@ -1347,6 +1344,12 @@ void XMLCOL::WriteColumn(PGLOBAL g)
     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.             */
   /*********************************************************************/
   if (Tdbp->Clist) {