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

- XML and INI tables now return NULL when a node does not exist in a row (XML)

Browse Source 
or if the key is missing in a section (INI)

modified:
  mysql-test/suite/connect/r/ini.result
  mysql-test/suite/connect/r/xml.result
  storage/connect/tabsys.cpp
  storage/connect/tabxml.cpp

- Do a sub-storage cleanup on info commands and fix a limit of column number
  in ODBCColumns. This was doing a crash for unexpected longjmp when many info
  commands were executed in a row.

modified:
  storage/connect/ha_connect.cc
  storage/connect/odbconn.cpp
This commit is contained in:
Olivier Bertrand
2013-03-10 15:10:00 +01:00
parent c7b95cb9df
commit 7a30ec7231
6 changed files with 85 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
storage/connect/tabxml.cpp
View File

@@ -1222,10 +1222,14 @@ void XMLCOL::ReadColumn(PGLOBAL g)
longjmp(g->jumper[g->jump_level], TYPE_AM_XML);
} // endswitch
} else
*Valbuf = '\0';
Value->SetValue_psz(Valbuf);
} else {
if (Nullable)
Value->SetNull(true);
Value->Reset(); // Null value
} // endif ValNode
Value->SetValue_psz(Valbuf);
Nx = Tdbp->Irow;
} // end of ReadColumn
@@ -1400,45 +1404,50 @@ void XMULCOL::ReadColumn(PGLOBAL g)
else if (Sx == Tdbp->Nsub)
return; // Same row
n = Nl->GetLength();
*(p = Valbuf) = '\0';
len = Long;
if ((n = Nl->GetLength())) {
*(p = Valbuf) = '\0';
len = Long;
for (i = Tdbp->Nsub; i < n; i++) {
ValNode = Nl->GetItem(g, i, Vxnp);
for (i = Tdbp->Nsub; i < n; i++) {
ValNode = Nl->GetItem(g, i, Vxnp);
if (ValNode->GetType() != XML_ELEMENT_NODE &&
ValNode->GetType() != XML_ATTRIBUTE_NODE) {
sprintf(g->Message, MSG(BAD_VALNODE), ValNode->GetType(), Name);
longjmp(g->jumper[g->jump_level], TYPE_AM_XML);
} // endif type
// Get the Xname value from the XML file
switch (ValNode->GetContent(g, p, len + 1)) {
case RC_OK:
break;
case RC_INFO:
PushWarning(g, Tdbp);
break;
default:
if (ValNode->GetType() != XML_ELEMENT_NODE &&
ValNode->GetType() != XML_ATTRIBUTE_NODE) {
sprintf(g->Message, MSG(BAD_VALNODE), ValNode->GetType(), Name);
longjmp(g->jumper[g->jump_level], TYPE_AM_XML);
} // endswitch
} // endif type
if (!Tdbp->Xpand) {
// Concatenate all values
if (n - i > 1)
strncat(Valbuf, ", ", Long + 1);
// Get the Xname value from the XML file
switch (ValNode->GetContent(g, p, len + 1)) {
case RC_OK:
break;
case RC_INFO:
PushWarning(g, Tdbp);
break;
default:
longjmp(g->jumper[g->jump_level], TYPE_AM_XML);
} // endswitch
len -= strlen(p);
p += strlen(p);
} else
break;
if (!Tdbp->Xpand) {
// Concatenate all values
if (n - i > 1)
strncat(Valbuf, ", ", Long + 1);
} // endfor i
len -= strlen(p);
p += strlen(p);
} else
break;
// } // endif Nx
} // endfor i
Value->SetValue_psz(Valbuf);
} else {
if (Nullable)
Value->SetNull(true);
Value->Reset(); // Null value
} // endif ValNode
Value->SetValue_psz(Valbuf);
Nx = Tdbp->Irow;
Sx = Tdbp->Nsub;
Tdbp->NextSame = (Tdbp->Xpand && Nl->GetLength() - Sx > 1);
@@ -1640,9 +1649,7 @@ void XPOSCOL::ReadColumn(PGLOBAL g)
longjmp(g->jumper[g->jump_level], TYPE_AM_XML);
} // endif Clist
*Valbuf = '\0';
if ((ValNode = Tdbp->Clist->GetItem(g, Rank, Vxnp)))
if ((ValNode = Tdbp->Clist->GetItem(g, Rank, Vxnp))) {
// Get the column value from the XML file
switch (ValNode->GetContent(g, Valbuf, Long + 1)) {
case RC_OK:
@@ -1654,7 +1661,14 @@ void XPOSCOL::ReadColumn(PGLOBAL g)
longjmp(g->jumper[g->jump_level], TYPE_AM_XML);
} // endswitch
Value->SetValue_psz(Valbuf);
Value->SetValue_psz(Valbuf);
} else {
if (Nullable)
Value->SetNull(true);
Value->Reset(); // Null value
} // endif ValNode
Nx = Tdbp->Irow;
} // end of ReadColumn