diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-04-21 18:34:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-21 18:34:06 +0200 |
| commit | 8d75a7533ee80efa5275a058dfadf8947e5857a6 (patch) | |
| tree | 463cddda9c516dc3cd7c3e94fb08910210473622 /sql/item_xmlfunc.cc | |
| parent | e056d1f1ca91ebe40467ed46be00be0add9cf247 (diff) | |
| parent | c6ee3fe9d4056dcd6ee9f9aabd3424c1b27fc506 (diff) | |
| download | mariadb-git-8d75a7533ee80efa5275a058dfadf8947e5857a6.tar.gz | |
Merge branch '5.5' into 10.0
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 f8bf7cbf93a..c7fd923b0ae 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 @@ -2751,9 +2752,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; |