Commit 2b238773 authored by unknown's avatar unknown
Browse files

Post-Merge Fix.

parent c81e69e9

mysql-test/r/mysqldump.result

+22 −23
Original line number Diff line number Diff line
@@ -3195,6 +3195,28 @@ UNLOCK TABLES; 


DROP TABLE `t1`;

#

# Bug #19745: mysqldump --xml produces invalid xml

#

DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (f1 int(10), data MEDIUMBLOB);

INSERT INTO t1 VALUES(1,0xff00fef0);

<?xml version="1.0"?>

<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<database name="test">

	<table_structure name="t1">

		<field Field="f1" Type="int(10)" Null="YES" Key="" Extra="" />

		<field Field="data" Type="mediumblob" Null="YES" Key="" Extra="" />

	</table_structure>

	<table_data name="t1">

	<row>

		<field name="f1">1</field>

		<field name="data" xsi:type="xs:hexBinary">FF00FEF0</field>

	</row>

	</table_data>

</database>

</mysqldump>

DROP TABLE t1;

#

# End of 5.0 tests

#

drop table if exists t1;
@@ -3235,29 +3257,6 @@ UNLOCK TABLES; 
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;



DROP TABLE t1;

# Bug #19745: mysqldump --xml produces invalid xml

#

DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (f1 int(10), data MEDIUMBLOB);

INSERT INTO t1 VALUES(1,0xff00fef0);

<?xml version="1.0"?>

<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<database name="test">

	<table_structure name="t1">

		<field Field="f1" Type="int(10)" Null="YES" Key="" Extra="" />

		<field Field="data" Type="mediumblob" Null="YES" Key="" Extra="" />

	</table_structure>

	<table_data name="t1">

	<row>

		<field name="f1">1</field>

		<field name="data" xsi:type="xs:hexBinary">FF00FEF0</field>

	</row>

	</table_data>

</database>

</mysqldump>

DROP TABLE t1;

#

# End of 5.0 tests

create table t1 (a text , b text);

create table t2 (a text , b text);

insert t1 values ("Duck, Duck", "goose");