diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-04-11 10:18:04 -0400 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-11 10:18:04 -0400 |
| commit | 663068c6eea736a38eff9ac183326d6c7e4e239b (patch) | |
| tree | 54927ab8209a73403320aac67b6172508caed7d6 /sql/item_xmlfunc.cc | |
| parent | 5c579482eb2dd33c7fea80ea1ab412977606458a (diff) | |
| parent | 6fa5e0814662d691be1a29bf88332348ec7c50c9 (diff) | |
| download | mariadb-git-663068c6eea736a38eff9ac183326d6c7e4e239b.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55
Diffstat (limited to 'sql/item_xmlfunc.cc')
| -rw-r--r-- | sql/item_xmlfunc.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item_xmlfunc.cc b/sql/item_xmlfunc.cc index 064038a06fe..a49b5749f88 100644 --- a/sql/item_xmlfunc.cc +++ b/sql/item_xmlfunc.cc @@ -1,4 +1,5 @@ -/* Copyright (c) 2005, 2013, Oracle and/or its affiliates. +/* Copyright (c) 2005, 2016, Oracle and/or its affiliates. + Copyright (c) 2009, 2017, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -2706,9 +2707,9 @@ int xml_enter(MY_XML_PARSER *st,const char *attr, size_t len) node.parent= data->parent; // Set parent for the new node to old parent data->parent= numnodes; // Remember current node as new parent - DBUG_ASSERT(data->level <= MAX_LEVEL); + DBUG_ASSERT(data->level < MAX_LEVEL); data->pos[data->level]= numnodes; - if (data->level < MAX_LEVEL) + if (data->level < MAX_LEVEL - 1) node.level= data->level++; else return MY_XML_ERROR; |