diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2021-04-06 12:52:44 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2021-04-06 12:52:44 +0200 |
| commit | c030f4c625b90baa17cb8c73a018a327aa12b557 (patch) | |
| tree | 25466f53c50fc7d92e0b17f04c206f3ccf59eb47 /storage/connect/mysql-test | |
| parent | 28b76afceac1eb2c35e77439142daac53908cdc3 (diff) | |
| parent | 6fe624b5acf51383d39eb0e547a03779d41cf4a8 (diff) | |
| download | mariadb-git-c030f4c625b90baa17cb8c73a018a327aa12b557.tar.gz | |
Commit last pull from origin
Diffstat (limited to 'storage/connect/mysql-test')
| -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 6a0c9db27b3..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: Unable to save character to 'iso-8859-1' encoding.
- +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; |