diff options
| author | jani@ua141d10.elisa.omakaista.fi <> | 2005-10-28 02:36:19 +0300 |
|---|---|---|
| committer | jani@ua141d10.elisa.omakaista.fi <> | 2005-10-28 02:36:19 +0300 |
| commit | af50eff0d29bdb08f98124f9e8f8a5eb063c16c4 (patch) | |
| tree | 15e24b28ea84bf971a840e358e58bfdcfb90ebe9 /mysql-test/t/insert_select.test | |
| parent | cbe21a8eb6c53ed4eb7f6228a322d642abacde95 (diff) | |
| download | mariadb-git-af50eff0d29bdb08f98124f9e8f8a5eb063c16c4.tar.gz | |
Merge 4.1 - 5.0
Diffstat (limited to 'mysql-test/t/insert_select.test')
| -rw-r--r-- | mysql-test/t/insert_select.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/insert_select.test b/mysql-test/t/insert_select.test index a19a700aeb9..5dd6f338865 100644 --- a/mysql-test/t/insert_select.test +++ b/mysql-test/t/insert_select.test @@ -220,7 +220,7 @@ create table t2(x int, z int); insert into t1(x,y) select x,z from t2 on duplicate key update x=values(x); --error 1054 insert into t1(x,y) select x,z from t2 on duplicate key update x=values(z); ---error 1109 +--error 1054 insert into t1(x,y) select x,z from t2 on duplicate key update x=values(t2.x); drop table t1,t2; |