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

Commit merge resolved files

Browse Source
This commit is contained in:
Olivier Bertrand
2015-06-05 10:59:15 +02:00
parent 0599d80fcc a99efc00a6
commit a8b7b6c85b
1197 changed files with 55725 additions and 25228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
storage/connect/tabxml.cpp
View File

@@ -1482,6 +1482,11 @@ bool XMLCOL::ParseXpath(PGLOBAL g, bool mode)
// HTML like table, columns are retrieved by position
new(this) XPOSCOL(Value); // Change the class of this column
Inod = -1;
<<<<<<< HEAD
=======
// Tdbp->Hasnod = true;
// return false;
>>>>>>> MariaDB/10.0
} else if (Type == 0 && !mode) {
strcat(strcat(pbuf, "@"), Name);
} else { // Type == 1