database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

- Fix bug MDEV-5928

Browse Source 
modified:
  storage/connect/tabxml.cpp
This commit is contained in:
Olivier Bertrand
2014-03-21 23:58:11 +01:00
parent 70e865cc19
commit 21d9c5824b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
storage/connect/tabxml.cpp
View File

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