diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-06-05 16:10:50 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-06-05 16:10:50 +0200 |
| commit | 88998cfaac83e2267f427c551c1f350fa1a505be (patch) | |
| tree | e21fe97611b862b149039f611bdb79009a78f70d /storage/connect/tabxml.cpp | |
| parent | a8b7b6c85b4817adafbd5258151f1ff21e7ac8ff (diff) | |
| download | mariadb-git-88998cfaac83e2267f427c551c1f350fa1a505be.tar.gz | |
Commit merge resolved files
Diffstat (limited to 'storage/connect/tabxml.cpp')
| -rw-r--r-- | storage/connect/tabxml.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/storage/connect/tabxml.cpp b/storage/connect/tabxml.cpp index 4d6f5933cbf..49fa9a1c554 100644 --- a/storage/connect/tabxml.cpp +++ b/storage/connect/tabxml.cpp @@ -1482,11 +1482,6 @@ 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 |