summaryrefslogtreecommitdiff
path: root/mysql-test/suite/pbxt/r
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-05-03 19:11:39 +0300
committerMichael Widenius <monty@askmonty.org>2011-05-03 19:11:39 +0300
commit547ef66609b479adeb3a25d5c37e4b185623a2cf (patch)
tree78265dc8ed941f1f55f331f5e86576df090043ff /mysql-test/suite/pbxt/r
parent1be5462d59fa5fbd1ca92286c3a0a049c00f4bb9 (diff)
parentf74853053ff7cb4420b09923d9c648620e7fa73c (diff)
downloadmariadb-git-547ef66609b479adeb3a25d5c37e4b185623a2cf.tar.gz
Automatic merge with MariaDB 5.1
Diffstat (limited to 'mysql-test/suite/pbxt/r')
-rw-r--r--mysql-test/suite/pbxt/r/client_xml.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/pbxt/r/client_xml.result b/mysql-test/suite/pbxt/r/client_xml.result
index 6a148954fcd..20730ff0a09 100644
--- a/mysql-test/suite/pbxt/r/client_xml.result
+++ b/mysql-test/suite/pbxt/r/client_xml.result
@@ -18,9 +18,9 @@ insert into t1 values (1, 2, 'a&b a<b a>b');
<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<database name="test">
<table_structure name="t1">
- <field Field="a&amp;b" Type="int(11)" Null="YES" Key="" Extra="" />
- <field Field="a&lt;b" Type="int(11)" Null="YES" Key="" Extra="" />
- <field Field="a&gt;b" Type="text" Null="YES" Key="" Extra="" />
+ <field Field="a&amp;b" Type="int(11)" Null="YES" Key="" Extra="" Comment="" />
+ <field Field="a&lt;b" Type="int(11)" Null="YES" Key="" Extra="" Comment="" />
+ <field Field="a&gt;b" Type="text" Null="YES" Key="" Extra="" Comment="" />
</table_structure>
<table_data name="t1">
<row>