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

MDEV-36427 - FTBFS with libxml2 2.14.0

Browse Source 
Connect engine fails to build with libxml2 2.14.0.

Connect engine uses "#ifndef BASE_BUFFER_SIZE" to determine if libxml2 is
available. If libxml2 is unavailable it did redefine xmlElementType enum
of libxml/tree.h. The reasons for this redefinition is vague, most
probably some of these constants were used when connect was compiled with
MSXML, while libxml2 was disabled.

However BASE_BUFFER_SIZE constant was removed from libxml2 recently, as
a result connect fails to build due to xmlElementType constants
redefinition.

Use LIBXML2_SUPPORT instead of BASE_BUFFER_SIZE for libxml2 availability
check.
This commit is contained in:
Sergey Vojtovich
2025-04-05 21:06:41 +04:00
committed by Sergei Golubchik
parent 25737dbab7
commit b02ad4a6f8
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
storage/connect/plgxml.h
View File

@@ -5,7 +5,7 @@
/******************************************************************/ /******************************************************************/
/* Dual XML implementation base classes defines. */ /* Dual XML implementation base classes defines. */
/******************************************************************/ /******************************************************************/
#if !defined(BASE_BUFFER_SIZE) #ifndef LIBXML2_SUPPORT
enum ElementType { // libxml2 enum ElementType { // libxml2
XML_ELEMENT_NODE = 1, XML_ELEMENT_NODE = 1,
XML_ATTRIBUTE_NODE = 2, XML_ATTRIBUTE_NODE = 2,
@@ -28,7 +28,7 @@ enum ElementType { // libxml2
XML_XINCLUDE_START = 19, XML_XINCLUDE_START = 19,
XML_XINCLUDE_END = 20, XML_XINCLUDE_END = 20,
XML_DOCB_DOCUMENT_NODE = 21}; XML_DOCB_DOCUMENT_NODE = 21};
#endif // !BASE_BUFFER_SIZE #endif
//#if !defined(NODE_TYPE_LIST) //#if !defined(NODE_TYPE_LIST)
#ifdef NOT_USED #ifdef NOT_USED

3
storage/connect/tabxml.cpp
View File

@@ -26,6 +26,9 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <unistd.h> #include <unistd.h>
//#include <ctype.h> //#include <ctype.h>
#ifdef LIBXML2_SUPPORT
#include <libxml/tree.h>
#endif
#include "osutil.h" #include "osutil.h"
#define _O_RDONLY O_RDONLY #define _O_RDONLY O_RDONLY
#endif // !_WIN32 #endif // !_WIN32