diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-05-09 13:24:52 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-05-09 13:24:52 +0200 |
| commit | c91ecf9e9bebf3cf2dafbd3193de4df94be09870 (patch) | |
| tree | a9ab429c8e8a6a50c38557cbdd38d9612480f49c /mysql-test/r/loadxml.result | |
| parent | 2645bda5f20ab10bc26dc1cb69f91b5505c1faae (diff) | |
| parent | c92168fcd26aad35bd4cb5d65175e3545133f201 (diff) | |
| download | mariadb-git-c91ecf9e9bebf3cf2dafbd3193de4df94be09870.tar.gz | |
Merge branch '10.1' into 10.2
Revert commit db0917f68f, because the fix for MDEV-12696
is coming from 5.5 and 10.1 in this merge.
Diffstat (limited to 'mysql-test/r/loadxml.result')
| -rw-r--r-- | mysql-test/r/loadxml.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/loadxml.result b/mysql-test/r/loadxml.result index 711fea9e854..34719a27afc 100644 --- a/mysql-test/r/loadxml.result +++ b/mysql-test/r/loadxml.result @@ -129,8 +129,8 @@ DROP TABLE t1; CREATE TABLE t1 (c1 TEXT); CREATE VIEW v1 AS SELECT CONCAT(c1,'') AS c1, NULL AS c2 FROM t1; LOAD XML INFILE '../../std_data/loaddata/mdev12696.xml' INTO TABLE v1 (c1); -ERROR HY000: Invalid column reference (v1.c1) in LOAD DATA +ERROR HY000: Column 'c1' is not updatable LOAD XML INFILE '../../std_data/loaddata/mdev12696.xml' INTO TABLE v1 (c2); -ERROR HY000: Invalid column reference (v1.c2) in LOAD DATA +ERROR HY000: Column 'c2' is not updatable DROP VIEW v1; DROP TABLE t1; |