revision-id: 54d0a55adf6fbfc92c5473bbcad2b459f14ef038 (mariadb-10.2.23-116-g54d0a55adf6) parent(s): ad53218a9d173131f1ea941a2686c7f78e345c92 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-05-05 20:06:29 +0200 message: fix of results --- storage/connect/mysql-test/connect/r/xml.result | 98 ++++++++++++------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/storage/connect/mysql-test/connect/r/xml.result b/storage/connect/mysql-test/connect/r/xml.result index c4635ba053e..6a0c9db27b3 100644 --- a/storage/connect/mysql-test/connect/r/xml.result +++ b/storage/connect/mysql-test/connect/r/xml.result @@ -158,47 +158,47 @@ TRANSLATOR NULL PUBLISHER Eyrolles Paris DATEPUB 1998 SELECT LOAD_FILE('MYSQLD_DATADIR/test/xsample2.xml') AS xml; -xml <?xml version="1.0" encoding="UTF-8"?> -<BIBLIO SUBJECT="XML"> - <BOOK ISBN="9782212090819" LANG="fr" SUBJECT="applications"> - <AUTHOR> - <FIRSTNAME>Jean-Christophe</FIRSTNAME> - <LASTNAME>Bernadac</LASTNAME> - </AUTHOR> - <AUTHOR> - <FIRSTNAME>François</FIRSTNAME> - <LASTNAME>Knab</LASTNAME> - </AUTHOR> - <TITLE>Construire une application XML</TITLE> - <PUBLISHER> - <NAME>Eyrolles</NAME> - <PLACE>Paris</PLACE> - </PUBLISHER> - <DATEPUB>1999</DATEPUB> - </BOOK> - <BOOK ISBN="9782840825685" LANG="fr" SUBJECT="applications"> - <AUTHOR> - <FIRSTNAME>William J.</FIRSTNAME> - <LASTNAME>Pardi</LASTNAME> - </AUTHOR> - <TRANSLATOR PREFIX="adapté de l'anglais par"> - <FIRSTNAME>James</FIRSTNAME> - <LASTNAME>Guerin</LASTNAME> - </TRANSLATOR> - <TITLE>XML en Action</TITLE> - <PUBLISHER> - <NAME>Microsoft Press</NAME> - <PLACE>Paris</PLACE> - </PUBLISHER> - <DATEPUB>1999</DATEPUB> - </BOOK> - <BOOK ISBN="9782212090529" LANG="fr" SUBJECT="général"> - <AUTHOR>Alain Michard</AUTHOR> - <TITLE>XML, Langage et Applications</TITLE> - <PUBLISHER>Eyrolles Paris</PUBLISHER> - <DATEPUB>1998</DATEPUB> - </BOOK> -</BIBLIO> +xml <?xml version="1.0" encoding="UTF-8"?> +<BIBLIO SUBJECT="XML"> + <BOOK ISBN="9782212090819" LANG="fr" SUBJECT="applications"> + <AUTHOR> + <FIRSTNAME>Jean-Christophe</FIRSTNAME> + <LASTNAME>Bernadac</LASTNAME> + </AUTHOR> + <AUTHOR> + <FIRSTNAME>François</FIRSTNAME> + <LASTNAME>Knab</LASTNAME> + </AUTHOR> + <TITLE>Construire une application XML</TITLE> + <PUBLISHER> + <NAME>Eyrolles</NAME> + <PLACE>Paris</PLACE> + </PUBLISHER> + <DATEPUB>1999</DATEPUB> + </BOOK> + <BOOK ISBN="9782840825685" LANG="fr" SUBJECT="applications"> + <AUTHOR> + <FIRSTNAME>William J.</FIRSTNAME> + <LASTNAME>Pardi</LASTNAME> + </AUTHOR> + <TRANSLATOR PREFIX="adapté de l'anglais par"> + <FIRSTNAME>James</FIRSTNAME> + <LASTNAME>Guerin</LASTNAME> + </TRANSLATOR> + <TITLE>XML en Action</TITLE> + <PUBLISHER> + <NAME>Microsoft Press</NAME> + <PLACE>Paris</PLACE> + </PUBLISHER> + <DATEPUB>1999</DATEPUB> + </BOOK> + <BOOK ISBN="9782212090529" LANG="fr" SUBJECT="général"> + <AUTHOR>Alain Michard</AUTHOR> + <TITLE>XML, Langage et Applications</TITLE> + <PUBLISHER>Eyrolles Paris</PUBLISHER> + <DATEPUB>1998</DATEPUB> + </BOOK> +</BIBLIO> DROP TABLE t1; # @@ -374,7 +374,7 @@ INSERT INTO t1 VALUES (_cp1251 0xC0C1C2C3); Warnings: Level Warning 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 ('&<>"\''); SELECT node, hex(node) FROM t1; @@ -383,11 +383,11 @@ hex(node) 263C3E2227 DROP TABLE t1; SET @a=LOAD_FILE('MYSQLD_DATADIR/test/t1.xml'); SELECT CAST(@a AS CHAR CHARACTER SET latin1); -CAST(@a AS CHAR CHARACTER SET latin1) <?xml version="1.0" encoding="iso-8859-1"?> -<!-- Created by the MariaDB CONNECT Storage Engine--> -<t1> - <line> - <node>&<>"'</node> - </line> -</t1> +CAST(@a AS CHAR CHARACTER SET latin1) <?xml version="1.0" encoding="iso-8859-1"?> +<!-- Created by the MariaDB CONNECT Storage Engine--> +<t1> + <line> + <node>&<>"'</node> + </line> +</t1>