diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-01-29 12:42:34 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-01-29 13:40:05 +0100 |
| commit | 9c84852809214e97cf91327a798204c1b745881e (patch) | |
| tree | d1c643f8fddfead7590269ffbc054c152fb92b63 | |
| parent | 496f7090a825ac7ee54a6b5f9700e5f261e4bce0 (diff) | |
| download | mariadb-git-9c84852809214e97cf91327a798204c1b745881e.tar.gz | |
fix of warning on windows
| -rw-r--r-- | storage/connect/mysql-test/connect/r/xml.result | 3 | ||||
| -rw-r--r-- | storage/connect/mysql-test/connect/t/xml.test | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/mysql-test/connect/r/xml.result b/storage/connect/mysql-test/connect/r/xml.result index 599c35cb1ed..575c903bbbc 100644 --- a/storage/connect/mysql-test/connect/r/xml.result +++ b/storage/connect/mysql-test/connect/r/xml.result @@ -374,8 +374,7 @@ INSERT INTO t1 VALUES (_cp1251 0xC0C1C2C3); Warnings: Level Warning Code 1105 -Message Com error: Impossible d'enregistrer le caractère dans le codage iso-8859-1.
- +Message warning about characters outside of iso-8859-1 INSERT INTO t1 VALUES ('&<>"\''); SELECT node, hex(node) FROM t1; node &<>"' diff --git a/storage/connect/mysql-test/connect/t/xml.test b/storage/connect/mysql-test/connect/t/xml.test index 0fdf8e90b6e..e837ec79604 100644 --- a/storage/connect/mysql-test/connect/t/xml.test +++ b/storage/connect/mysql-test/connect/t/xml.test @@ -300,6 +300,7 @@ CREATE TABLE t1 (node VARCHAR(50)) ENGINE=connect TABLE_TYPE=xml FILE_NAME='t1.xml' OPTION_LIST='xmlsup=domdoc,rownode=line,encoding=iso-8859-1'; INSERT INTO t1 VALUES (_latin1 0xC0C1C2C3); +--replace_regex /.*iso-8859-1.*/warning about characters outside of iso-8859-1/ INSERT INTO t1 VALUES (_cp1251 0xC0C1C2C3); INSERT INTO t1 VALUES ('&<>"\''); SELECT node, hex(node) FROM t1; |