mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
- Fix crash on making an XML table with encoding=XXX
- Set parameters so libxml2 does not anymore add extra characters when retrieving several subnodes of a node. - Make a CONNECT file header (was PlugDB) modified: storage/connect/domdoc.cpp storage/connect/libdoc.cpp storage/connect/tabxml.cpp - Change the version number modified: storage/connect/ha_connect.cc - Begin eliminate use of libmysql functions in MYSQL table type Not finished yet modified: storage/connect/myconn.cpp storage/connect/myconn.h
This commit is contained in:
@@ -496,8 +496,9 @@ bool TDBXML::Initialize(PGLOBAL g)
|
||||
goto error;
|
||||
} // endif NewDoc
|
||||
|
||||
// Add a PlugDB comment node
|
||||
sprintf(buf, MSG(CREATED_PLUGDB), version);
|
||||
// Add a CONNECT comment node
|
||||
// sprintf(buf, MSG(CREATED_PLUGDB), version);
|
||||
sprintf(buf, " Created by CONNECT %s ", version);
|
||||
Docp->AddComment(g, buf);
|
||||
|
||||
if (XmlDB) {
|
||||
@@ -914,7 +915,14 @@ void TDBXML::CloseDB(PGLOBAL g)
|
||||
TabNode->AddText(g, "\n");
|
||||
|
||||
// Save the modified document
|
||||
int rc = Docp->DumpDoc(g, filename);
|
||||
if (Docp->DumpDoc(g, filename)) {
|
||||
PushWarning(g, this);
|
||||
Docp->CloseDoc(g, To_Xb);
|
||||
|
||||
// This causes a crash in Diagnostics_area::set_error_status
|
||||
// longjmp(g->jumper[g->jump_level], TYPE_AM_XML);
|
||||
} // endif DumpDoc
|
||||
|
||||
} // endif Changed
|
||||
|
||||
// Free the document and terminate XML processing
|
||||
|
Reference in New Issue
Block a user