diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-30 11:15:30 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-30 11:15:30 +0200 |
| commit | 898521e2dd8a4a6706cba01b6ef0a7cea4114fd0 (patch) | |
| tree | 4ef9a6ddc4298574bb75db673c2412f83c107c5b /storage/connect/tabxml.cpp | |
| parent | 571bcf9aaaf59b84e24bbfb809738dea25495d78 (diff) | |
| parent | 199863d72b7cccaa4c75641c50c45a83b568ab8c (diff) | |
| download | mariadb-git-898521e2dd8a4a6706cba01b6ef0a7cea4114fd0.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/connect/tabxml.cpp')
| -rw-r--r-- | storage/connect/tabxml.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/storage/connect/tabxml.cpp b/storage/connect/tabxml.cpp index b6260eb66ee..81c19ff1a4f 100644 --- a/storage/connect/tabxml.cpp +++ b/storage/connect/tabxml.cpp @@ -3,7 +3,7 @@ /* ------------- */ /* Version 3.0 */ /* */ -/* Author Olivier BERTRAND 2007 - 2017 */ +/* Author Olivier BERTRAND 2007 - 2020 */ /* */ /* This program are the XML tables classes using MS-DOM or libxml2. */ /***********************************************************************/ @@ -62,6 +62,8 @@ extern "C" char version[]; #define TYPE_UNKNOWN 12 /* Must be greater than other types */ #define XLEN(M) sizeof(M) - strlen(M) - 1 /* To avoid overflow*/ +int GetDefaultDepth(void); + /***********************************************************************/ /* Class and structure used by XMLColumns. */ /***********************************************************************/ @@ -149,8 +151,9 @@ PQRYRES XMLColumns(PGLOBAL g, char *db, char *tab, PTOS topt, bool info) strcpy(g->Message, MSG(MISSING_FNAME)); return NULL; } else { - lvl = GetIntegerTableOption(g, topt, "Level", 0); - lvl = (lvl < 0) ? 0 : (lvl > 16) ? 16 : lvl; + lvl = GetIntegerTableOption(g, topt, "Level", GetDefaultDepth()); + lvl = GetIntegerTableOption(g, topt, "Depth", lvl); + lvl = (lvl < 0) ? 0 : (lvl > 16) ? 16 : lvl; } // endif fn if (trace(1)) |