diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-02-02 00:18:32 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-02-02 00:18:32 +0100 |
| commit | 9ca150aa2c872d3254d7760480be9c832ea6cb59 (patch) | |
| tree | 5535d68f1c79407717e9ed81d97336a340710ccb /storage/connect/tabxml.cpp | |
| parent | f1b87189c64de8079010d3d9cbcb2f8fe07412f4 (diff) | |
| download | mariadb-git-9ca150aa2c872d3254d7760480be9c832ea6cb59.tar.gz | |
2>libdoc.cpp
2>D:\CommonSource\mariadb-10.0\include\my_pthread.h(120) : warning C4005: '_REENTRANT' : redéfinition de macro
2> D:\Libxml\include\libxml/xmlexports.h(77) : voir la définition précédente de '_REENTRANT'
2>.\libdoc.cpp(378) : error C2664: 'strlen' : impossible de convertir le paramètre 1 de 'xmlChar *' en 'const char *'
2> Les types pointés n'ont aucun rapport entre eux ; conversion nécessitant reinterpret_cast, cast de style C ou cast de style fonction
2>.\libdoc.cpp(379) : error C2664: 'copy_and_convert' : impossible de convertir le paramètre 4 de 'xmlChar *' en 'const char *'
2> Les types pointés n'ont aucun rapport entre eux ; conversion nécessitant reinterpret_cast, cast de style C ou cast de style fonction
2>
Fix for that.
Diffstat (limited to 'storage/connect/tabxml.cpp')
| -rw-r--r-- | storage/connect/tabxml.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/storage/connect/tabxml.cpp b/storage/connect/tabxml.cpp index a480e6aafc5..d4cb0168ae7 100644 --- a/storage/connect/tabxml.cpp +++ b/storage/connect/tabxml.cpp @@ -904,22 +904,25 @@ int TDBXML::DeleteDB(PGLOBAL g, int irc) /***********************************************************************/
void TDBXML::CloseDB(PGLOBAL g)
{
- if (Changed) {
- char filename[_MAX_PATH];
-// PDBUSER dup = (PDBUSER)g->Activityp->Aptr;
+ if (Docp) {
+ if (Changed) {
+ char filename[_MAX_PATH];
+// PDBUSER dup = (PDBUSER)g->Activityp->Aptr;
- // We used the file name relative to recorded datapath
- PlugSetPath(filename, Xfile, GetPath());
+ // We used the file name relative to recorded datapath
+ PlugSetPath(filename, Xfile, GetPath());
- if (Mode == MODE_INSERT)
- TabNode->AddText(g, "\n");
+ if (Mode == MODE_INSERT)
+ TabNode->AddText(g, "\n");
- // Save the modified document
- int rc = Docp->DumpDoc(g, filename);
- } // endif Changed
+ // Save the modified document
+ int rc = Docp->DumpDoc(g, filename);
+ } // endif Changed
+
+ // Free the document and terminate XML processing
+ Docp->CloseDoc(g, To_Xb);
+ } // endif docp
- // Free the document and terminate XML processing
- Docp->CloseDoc(g, To_Xb);
} // end of CloseDB
// ------------------------ XMLCOL functions ----------------------------
|