- Fix conversion bug for MS-DOM XML tables. The node content was written

  and read as if the table DATA_CHARSET was ANSI instead of UTF-8. Warning
  are now provided when the read content of a node is truncated.

modified:
  storage/connect/domdoc.cpp
  storage/connect/domdoc.h
  storage/connect/libdoc.cpp
  storage/connect/libdoc.h
  storage/connect/plgxml.h
  storage/connect/tabxml.cpp

- Conditional compilation of pre_create depending on the MARIADB setting.

modified:
  storage/connect/ha_connect.cc
  storage/connect/ha_connect.h

1 files changed, 1 insertions, 1 deletions

diff --git a/storage/connect/domdoc.h b/storage/connect/domdoc.h
index e025ee13fc6..fc157950df8 100644
--- a/storage/connect/domdoc.h
+++ b/storage/connect/domdoc.h
@@ -71,7 +71,7 @@ class DOMNODE : public XMLNODE {
   virtual PXNODE GetChild(PGLOBAL g);
 
   // Methods
-  virtual char  *GetText(char *buf, int len);
+  virtual RCODE  GetContent(PGLOBAL g, char *buf, int len);
   virtual bool   SetContent(PGLOBAL g, char *txtp, int len);
   virtual PXNODE Clone(PGLOBAL g, PXNODE np);
   virtual PXLIST GetChildElements(PGLOBAL g, char *xp, PXLIST lp);