1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'connect/10.1' into 10.1

Browse Source
This commit is contained in:
Oleksandr Byelkin 2020-04-30 18:57:45 +02:00
commit 4fc8961d49
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
storage/connect/tabxml.cpp
View File

@ -813,12 +813,15 @@ bool TDBXML::Initialize(PGLOBAL g)
if (Void) if (Void)
return false; return false;
if (Columns && !Bufdone) { if (Columns) {
// Allocate the buffers that will contain node values // Allocate the buffers that will contain node values
for (colp = (PXMLCOL)Columns; colp; colp = (PXMLCOL)colp->GetNext()) for (colp = (PXMLCOL)Columns; colp; colp = (PXMLCOL)colp->GetNext())
if (!colp->IsSpecial()) // Not a pseudo column if (!colp->IsSpecial()) { // Not a pseudo column
if (colp->AllocBuf(g, Mode == MODE_INSERT)) if (!Bufdone && colp->AllocBuf(g, Mode == MODE_INSERT))
return true; return true;
colp->Nx = colp->Sx = -1;
} // endif Special
Bufdone = true; Bufdone = true;
} // endif Bufdone } // endif Bufdone

1
storage/connect/tabxml.h
View File

@ -157,6 +157,7 @@ class DllExport TDBXML : public TDBASE {
/* Class XMLCOL: XDB table access method column descriptor. */ /* Class XMLCOL: XDB table access method column descriptor. */
/***********************************************************************/ /***********************************************************************/
class XMLCOL : public COLBLK { class XMLCOL : public COLBLK {
friend class TDBXML;
public: public:
// Constructors // Constructors
XMLCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am = "XML"); XMLCOL(PCOLDEF cdp, PTDB tdbp, PCOL cprec, int i, PCSZ am = "XML");