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

12
storage/connect/tabsys.cpp
View File

@@ -507,12 +507,20 @@ void INICOL::ReadColumn(PGLOBAL g)
Valbuf[Long] = '\0';
break;
default:
GetPrivateProfileString(tdbp->Section, Name, "",
GetPrivateProfileString(tdbp->Section, Name, "<EFBFBD>",
Valbuf, Long + 1, tdbp->Ifile);
break;
} // endswitch Flag
Value->SetValue_psz(Valbuf);
// Missing keys are interpreted as null values
if (!strcmp(Valbuf, "<EFBFBD>")) {
if (Nullable)
Value->SetNull(true);
Value->Reset(); // Null value
} else
Value->SetValue_psz(Valbuf);
} // end of ReadColumn
/***********************************************************************/