diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-02 14:10:04 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-02 14:10:04 +0300 |
| commit | a708ba6524f27d0f0bc3bc4b4b9952f372d38bd0 (patch) | |
| tree | 52d813ba1e4f0b538b1f175a1d157d865cce8a22 /mysql-test/r/insert.result | |
| parent | 487bfd56d4386fe9abbd4beb80d759b0c5c95909 (diff) | |
| parent | 46aa4c2672e2d0b1727dde5b80bd5039adbf96f6 (diff) | |
| download | mariadb-git-a708ba6524f27d0f0bc3bc4b4b9952f372d38bd0.tar.gz | |
Manual merge from mysql-next-mr.
Diffstat (limited to 'mysql-test/r/insert.result')
| -rw-r--r-- | mysql-test/r/insert.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result index f5ad7aee4a9..36d2b9ef348 100644 --- a/mysql-test/r/insert.result +++ b/mysql-test/r/insert.result @@ -355,17 +355,17 @@ insert into t2 values (1,12), (2,24); insert into v1 (f1) values (3) on duplicate key update f3= f3 + 10; ERROR HY000: Can not modify more than one base table through a join view 'test.v1' insert into v1 (f1) values (3) on duplicate key update f1= f3 + 10; +ERROR HY000: Can not modify more than one base table through a join view 'test.v1' select * from t1; f1 f2 1 11 2 22 -3 NULL insert into v1 (f1) values (3) on duplicate key update f1= f3 + 10; +ERROR HY000: Can not modify more than one base table through a join view 'test.v1' select * from t1; f1 f2 1 11 2 22 -12 NULL drop view v1; drop table t1,t2; create table t1 (id int primary key auto_increment, data int, unique(data)); |