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

5.1 -> 5.2 merge

Browse source
This commit is contained in:
Sergei Golubchik 2013-02-28 19:00:58 +01:00
commit 5dec570d7c
115 changed files with 2398 additions and 1032 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sql/item_xmlfunc.cc
View file

@ -2678,8 +2678,12 @@ 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);
data->pos[data->level]= numnodes;
node.level= data->level++;
if (data->level < MAX_LEVEL)
node.level= data->level++;
else
return MY_XML_ERROR;
node.type= st->current_node_type; // TAG or ATTR
node.beg= attr;
node.end= attr + len;