summaryrefslogtreecommitdiff
path: root/storage/connect/tabxml.h
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2013-09-22 13:40:31 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2013-09-22 13:40:31 +0200
commit65b0e5455b547a3d574fa77b34cce23ae3bea0a0 (patch)
treec9d9d63f7fe6c031b16a8ddaec4fc8fa969ec2d6 /storage/connect/tabxml.h
parentbd37d644d6a93e595d98ec20172cad527c3e23bd (diff)
downloadmariadb-git-65b0e5455b547a3d574fa77b34cce23ae3bea0a0.tar.gz
- Fix several bugs causing memory leak or invalid access detected
by Valgrind. This concerns the XML libxml2 support. modified: storage/connect/domdoc.cpp storage/connect/domdoc.h storage/connect/ha_connect.cc storage/connect/libdoc.cpp storage/connect/plgdbsem.h storage/connect/plgxml.h storage/connect/tabxml.cpp storage/connect/tabxml.h
Diffstat (limited to 'storage/connect/tabxml.h')
-rw-r--r--storage/connect/tabxml.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/connect/tabxml.h b/storage/connect/tabxml.h
index 1bce0824e49..5aa038530c7 100644
--- a/storage/connect/tabxml.h
+++ b/storage/connect/tabxml.h
@@ -6,8 +6,6 @@
/* */
/* This file contains the XML table classes declares. */
/***********************************************************************/
-#define TYPE_AM_XML (AMT)127
-
typedef class XMLDEF *PXMLDEF;
typedef class TDBXML *PTDBXML;
typedef class XMLCOL *PXMLCOL;
@@ -81,7 +79,7 @@ class DllExport TDBXML : public TDBASE {
virtual void ResetDB(void) {N = 0;}
virtual void ResetSize(void) {MaxSize = -1;}
virtual int RowNumber(PGLOBAL g, bool b = false);
- int LoadTableFile(PGLOBAL g);
+ int LoadTableFile(PGLOBAL g, char *filename);
bool Initialize(PGLOBAL g);
bool SetTabNode(PGLOBAL g);
void SetNodeAttr(PGLOBAL g, char *attr, PXNODE node);