Skip to content

Commit 06b3715

Browse files
committed
Record some failing test results (dir,xml,xml2)
1 parent ec4795a commit 06b3715

File tree

3 files changed

+52
-52
lines changed

3 files changed

+52
-52
lines changed

storage/connect/mysql-test/connect/r/dir.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fname ftype size
2626
boys .txt 282
2727
boyswin .txt 288
2828
INSERT INTO t1 VALUES ('','','','');
29-
ERROR 22007: Incorrect double value: '' for column `test`.`t1`.`size` at row 1
29+
ERROR 22007: Incorrect double value: '' for column 'size' at row 1
3030
DROP TABLE t1;
3131
CREATE TABLE t1 ENGINE=CONNECT TABLE_TYPE=DIR FILE_NAME='*.txt';
3232
ERROR HY000: Cannot get column info for table type DIR

storage/connect/mysql-test/connect/r/xml.result

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -158,47 +158,47 @@ TRANSLATOR NULL
158158
PUBLISHER Eyrolles Paris
159159
DATEPUB 1998
160160
SELECT LOAD_FILE('MYSQLD_DATADIR/test/xsample2.xml') AS xml;
161-
xml <?xml version="1.0" encoding="UTF-8"?>
162-
<BIBLIO SUBJECT="XML">
163-
<BOOK ISBN="9782212090819" LANG="fr" SUBJECT="applications">
164-
<AUTHOR>
165-
<FIRSTNAME>Jean-Christophe</FIRSTNAME>
166-
<LASTNAME>Bernadac</LASTNAME>
167-
</AUTHOR>
168-
<AUTHOR>
169-
<FIRSTNAME>François</FIRSTNAME>
170-
<LASTNAME>Knab</LASTNAME>
171-
</AUTHOR>
172-
<TITLE>Construire une application XML</TITLE>
173-
<PUBLISHER>
174-
<NAME>Eyrolles</NAME>
175-
<PLACE>Paris</PLACE>
176-
</PUBLISHER>
177-
<DATEPUB>1999</DATEPUB>
178-
</BOOK>
179-
<BOOK ISBN="9782840825685" LANG="fr" SUBJECT="applications">
180-
<AUTHOR>
181-
<FIRSTNAME>William J.</FIRSTNAME>
182-
<LASTNAME>Pardi</LASTNAME>
183-
</AUTHOR>
184-
<TRANSLATOR PREFIX="adapté de l'anglais par">
185-
<FIRSTNAME>James</FIRSTNAME>
186-
<LASTNAME>Guerin</LASTNAME>
187-
</TRANSLATOR>
188-
<TITLE>XML en Action</TITLE>
189-
<PUBLISHER>
190-
<NAME>Microsoft Press</NAME>
191-
<PLACE>Paris</PLACE>
192-
</PUBLISHER>
193-
<DATEPUB>1999</DATEPUB>
194-
</BOOK>
195-
<BOOK ISBN="9782212090529" LANG="fr" SUBJECT="général">
196-
<AUTHOR>Alain Michard</AUTHOR>
197-
<TITLE>XML, Langage et Applications</TITLE>
198-
<PUBLISHER>Eyrolles Paris</PUBLISHER>
199-
<DATEPUB>1998</DATEPUB>
200-
</BOOK>
201-
</BIBLIO>
161+
xml <?xml version="1.0" encoding="UTF-8"?>
162+
<BIBLIO SUBJECT="XML">
163+
<BOOK ISBN="9782212090819" LANG="fr" SUBJECT="applications">
164+
<AUTHOR>
165+
<FIRSTNAME>Jean-Christophe</FIRSTNAME>
166+
<LASTNAME>Bernadac</LASTNAME>
167+
</AUTHOR>
168+
<AUTHOR>
169+
<FIRSTNAME>François</FIRSTNAME>
170+
<LASTNAME>Knab</LASTNAME>
171+
</AUTHOR>
172+
<TITLE>Construire une application XML</TITLE>
173+
<PUBLISHER>
174+
<NAME>Eyrolles</NAME>
175+
<PLACE>Paris</PLACE>
176+
</PUBLISHER>
177+
<DATEPUB>1999</DATEPUB>
178+
</BOOK>
179+
<BOOK ISBN="9782840825685" LANG="fr" SUBJECT="applications">
180+
<AUTHOR>
181+
<FIRSTNAME>William J.</FIRSTNAME>
182+
<LASTNAME>Pardi</LASTNAME>
183+
</AUTHOR>
184+
<TRANSLATOR PREFIX="adapté de l'anglais par">
185+
<FIRSTNAME>James</FIRSTNAME>
186+
<LASTNAME>Guerin</LASTNAME>
187+
</TRANSLATOR>
188+
<TITLE>XML en Action</TITLE>
189+
<PUBLISHER>
190+
<NAME>Microsoft Press</NAME>
191+
<PLACE>Paris</PLACE>
192+
</PUBLISHER>
193+
<DATEPUB>1999</DATEPUB>
194+
</BOOK>
195+
<BOOK ISBN="9782212090529" LANG="fr" SUBJECT="général">
196+
<AUTHOR>Alain Michard</AUTHOR>
197+
<TITLE>XML, Langage et Applications</TITLE>
198+
<PUBLISHER>Eyrolles Paris</PUBLISHER>
199+
<DATEPUB>1998</DATEPUB>
200+
</BOOK>
201+
</BIBLIO>
202202

203203
DROP TABLE t1;
204204
#
@@ -323,7 +323,7 @@ HEX(c) 3F3F3F3F3F3F3F
323323
Warnings:
324324
Level Warning
325325
Code 1366
326-
Message Incorrect string value: '\xC3\x81\xC3\x82\xC3\x83...' for column `test`.`t1`.`c` at row 1
326+
Message Incorrect string value: '\xC3\x81\xC3\x82\xC3\x83...' for column 'c' at row 1
327327
Level Warning
328328
Code 1105
329329
Message Out of range value ÁÂÃÄÅÆÇ for column 'c' at row 1
@@ -374,7 +374,7 @@ INSERT INTO t1 VALUES (_cp1251 0xC0C1C2C3);
374374
Warnings:
375375
Level Warning
376376
Code 1105
377-
Message Com error: Unable to save character to 'iso-8859-1' encoding.
377+
Message Com error: Unable to save character to 'iso-8859-1' encoding.
378378

379379
INSERT INTO t1 VALUES ('&<>"\'');
380380
SELECT node, hex(node) FROM t1;
@@ -383,11 +383,11 @@ hex(node) 263C3E2227
383383
DROP TABLE t1;
384384
SET @a=LOAD_FILE('MYSQLD_DATADIR/test/t1.xml');
385385
SELECT CAST(@a AS CHAR CHARACTER SET latin1);
386-
CAST(@a AS CHAR CHARACTER SET latin1) <?xml version="1.0" encoding="iso-8859-1"?>
387-
<!-- Created by the MariaDB CONNECT Storage Engine-->
388-
<t1>
389-
<line>
390-
<node>&amp;&lt;&gt;"'</node>
391-
</line>
392-
</t1>
386+
CAST(@a AS CHAR CHARACTER SET latin1) <?xml version="1.0" encoding="iso-8859-1"?>
387+
<!-- Created by the MariaDB CONNECT Storage Engine-->
388+
<t1>
389+
<line>
390+
<node>&amp;&lt;&gt;"'</node>
391+
</line>
392+
</t1>
393393

storage/connect/mysql-test/connect/r/xml2.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ HEX(c) 3F3F3F3F3F3F3F
325325
Warnings:
326326
Level Warning
327327
Code 1366
328-
Message Incorrect string value: '\xC3\x81\xC3\x82\xC3\x83...' for column `test`.`t1`.`c` at row 1
328+
Message Incorrect string value: '\xC3\x81\xC3\x82\xC3\x83...' for column 'c' at row 1
329329
Level Warning
330330
Code 1105
331331
Message Out of range value ÁÂÃÄÅÆÇ for column 'c' at row 1

0 commit comments

Comments
 (0)