diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-28 02:36:19 +0300 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-10-28 02:36:19 +0300 |
| commit | 1b574f5bdf347ddfeea3b6b704f1089ebb99ea98 (patch) | |
| tree | 15e24b28ea84bf971a840e358e58bfdcfb90ebe9 /mysql-test/t/insert_select.test | |
| parent | 7911c50718fa27c2fa56e99d765b54267481a8d2 (diff) | |
| download | mariadb-git-1b574f5bdf347ddfeea3b6b704f1089ebb99ea98.tar.gz | |
Merge 4.1 - 5.0
mysql-test/r/insert_select.result:
Merge from 4.1 to 5.0.
mysql-test/r/select.result:
Merge from 4.1 to 5.0.
mysql-test/t/insert_select.test:
Merge from 4.1 to 5.0.
mysys/my_handler.c:
Merge from 4.1 to 5.0.
sql/item.cc:
Merge from 4.1 to 5.0.
sql/item_timefunc.cc:
Imported bug fix from 4.1 to 5.0. (Bug#14016)
sql/item_timefunc.h:
Imported bug fix from 4.1 to 5.0. (Bug#14016)
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; |