Skip to content

M
MariaDB
Commit 54d0a55a authored by Oleksandr Byelkin's avatar Oleksandr Byelkin
Browse files
Options

fix of results

parent ad53218a
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 49 deletions
storage/connect/mysql-test/connect/r/xml.result
View file @ 54d0a55a
...@@ -158,47 +158,47 @@ TRANSLATOR NULL ...@@ -158,47 +158,47 @@ TRANSLATOR NULL
PUBLISHER Eyrolles Paris PUBLISHER Eyrolles Paris
DATEPUB 1998 DATEPUB 1998
SELECT LOAD_FILE('MYSQLD_DATADIR/test/xsample2.xml') AS xml; SELECT LOAD_FILE('MYSQLD_DATADIR/test/xsample2.xml') AS xml;
xml <?xml version="1.0" encoding="UTF-8"?> xml <?xml version="1.0" encoding="UTF-8"?>
<BIBLIO SUBJECT="XML"> <BIBLIO SUBJECT="XML">
<BOOK ISBN="9782212090819" LANG="fr" SUBJECT="applications"> <BOOK ISBN="9782212090819" LANG="fr" SUBJECT="applications">
<AUTHOR> <AUTHOR>
<FIRSTNAME>Jean-Christophe</FIRSTNAME> <FIRSTNAME>Jean-Christophe</FIRSTNAME>
<LASTNAME>Bernadac</LASTNAME> <LASTNAME>Bernadac</LASTNAME>
</AUTHOR> </AUTHOR>
<AUTHOR> <AUTHOR>
<FIRSTNAME>François</FIRSTNAME> <FIRSTNAME>François</FIRSTNAME>
<LASTNAME>Knab</LASTNAME> <LASTNAME>Knab</LASTNAME>
</AUTHOR> </AUTHOR>
<TITLE>Construire une application XML</TITLE> <TITLE>Construire une application XML</TITLE>
<PUBLISHER> <PUBLISHER>
<NAME>Eyrolles</NAME> <NAME>Eyrolles</NAME>
<PLACE>Paris</PLACE> <PLACE>Paris</PLACE>
</PUBLISHER> </PUBLISHER>
<DATEPUB>1999</DATEPUB> <DATEPUB>1999</DATEPUB>
</BOOK> </BOOK>
<BOOK ISBN="9782840825685" LANG="fr" SUBJECT="applications"> <BOOK ISBN="9782840825685" LANG="fr" SUBJECT="applications">
<AUTHOR> <AUTHOR>
<FIRSTNAME>William J.</FIRSTNAME> <FIRSTNAME>William J.</FIRSTNAME>
<LASTNAME>Pardi</LASTNAME> <LASTNAME>Pardi</LASTNAME>
</AUTHOR> </AUTHOR>
<TRANSLATOR PREFIX="adapté de l'anglais par"> <TRANSLATOR PREFIX="adapté de l'anglais par">
<FIRSTNAME>James</FIRSTNAME> <FIRSTNAME>James</FIRSTNAME>
<LASTNAME>Guerin</LASTNAME> <LASTNAME>Guerin</LASTNAME>
</TRANSLATOR> </TRANSLATOR>
<TITLE>XML en Action</TITLE> <TITLE>XML en Action</TITLE>
<PUBLISHER> <PUBLISHER>
<NAME>Microsoft Press</NAME> <NAME>Microsoft Press</NAME>
<PLACE>Paris</PLACE> <PLACE>Paris</PLACE>
</PUBLISHER> </PUBLISHER>
<DATEPUB>1999</DATEPUB> <DATEPUB>1999</DATEPUB>
</BOOK> </BOOK>
<BOOK ISBN="9782212090529" LANG="fr" SUBJECT="général"> <BOOK ISBN="9782212090529" LANG="fr" SUBJECT="général">
<AUTHOR>Alain Michard</AUTHOR> <AUTHOR>Alain Michard</AUTHOR>
<TITLE>XML, Langage et Applications</TITLE> <TITLE>XML, Langage et Applications</TITLE>
<PUBLISHER>Eyrolles Paris</PUBLISHER> <PUBLISHER>Eyrolles Paris</PUBLISHER>
<DATEPUB>1998</DATEPUB> <DATEPUB>1998</DATEPUB>
</BOOK> </BOOK>
</BIBLIO> </BIBLIO>
DROP TABLE t1; DROP TABLE t1;
# #
...@@ -374,7 +374,7 @@ INSERT INTO t1 VALUES (_cp1251 0xC0C1C2C3); ...@@ -374,7 +374,7 @@ INSERT INTO t1 VALUES (_cp1251 0xC0C1C2C3);
Warnings: Warnings:
Level Warning Level Warning
Code 1105 Code 1105
Message Com error: Unable to save character to 'iso-8859-1' encoding. Message Com error: Unable to save character to 'iso-8859-1' encoding.
INSERT INTO t1 VALUES ('&<>"\''); INSERT INTO t1 VALUES ('&<>"\'');
SELECT node, hex(node) FROM t1; SELECT node, hex(node) FROM t1;
...@@ -383,11 +383,11 @@ hex(node) 263C3E2227 ...@@ -383,11 +383,11 @@ hex(node) 263C3E2227
DROP TABLE t1; DROP TABLE t1;
SET @a=LOAD_FILE('MYSQLD_DATADIR/test/t1.xml'); SET @a=LOAD_FILE('MYSQLD_DATADIR/test/t1.xml');
SELECT CAST(@a AS CHAR CHARACTER SET latin1); SELECT CAST(@a AS CHAR CHARACTER SET latin1);
CAST(@a AS CHAR CHARACTER SET latin1) <?xml version="1.0" encoding="iso-8859-1"?> CAST(@a AS CHAR CHARACTER SET latin1) <?xml version="1.0" encoding="iso-8859-1"?>
<!-- Created by the MariaDB CONNECT Storage Engine--> <!-- Created by the MariaDB CONNECT Storage Engine-->
<t1> <t1>
<line> <line>
<node>&amp;&lt;&gt;"'</node> <node>&amp;&lt;&gt;"'</node>
</line> </line>
</t1> </t1>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7