diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-10-08 22:54:24 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-08 22:54:24 +0200 |
| commit | 82e9f6d948132b71abd57d8413f97f0cc2208d82 (patch) | |
| tree | 3ab146f819af46d42d93be133cea16b66ff5df7f /sql/sql_load.cc | |
| parent | c8d511293aae155210089b6de4143d11569af18d (diff) | |
| parent | b9768521bdeb1a8069c7b871f4536792b65fd79b (diff) | |
| download | mariadb-git-82e9f6d948132b71abd57d8413f97f0cc2208d82.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index b4f8b107f9b..75ddf80ea66 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -1,6 +1,6 @@ /* - Copyright (c) 2000, 2014, Oracle and/or its affiliates. - Copyright (c) 2010, 2014, Monty Progrm Ab + Copyright (c) 2000, 2015, Oracle and/or its affiliates. + Copyright (c) 2010, 2015, 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 @@ -2012,8 +2012,15 @@ int READ_INFO::read_xml() break; case '/': /* close tag */ - level--; chr= my_tospace(GET); + /* Decrease the 'level' only when (i) It's not an */ + /* (without space) empty tag i.e. <tag/> or, (ii) */ + /* It is of format <row col="val" .../> */ + if(chr != '>' || in_tag) + { + level--; + in_tag= false; + } if(chr != '>') /* if this is an empty tag <tag /> */ tag.length(0); /* we should keep tag value */ while(chr != '>' && chr != my_b_EOF) |