mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'mysql/5.5' into 5.5

Browse source
This commit is contained in:
Sergei Golubchik 2017-04-11 10:18:04 -04:00
commit 663068c6ee
41 changed files with 379 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sql/item_xmlfunc.cc
View file

@ -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;