summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorunknown <matthias@three.local.lan>2004-12-16 20:35:16 +0100
committerunknown <matthias@three.local.lan>2004-12-16 20:35:16 +0100
commitdfd38e1d6c537f4ede522a2eec33cdc739433b16 (patch)
tree95b3299e85dd799382bf64cb3b59503382bc0189 /mysql-test/r
parent73165ecacd9795c95b12f1482a71b090ebd94973 (diff)
parentae6f147a4f65b0392e61c6d447523fa9b6db186f (diff)
downloadmariadb-git-dfd38e1d6c537f4ede522a2eec33cdc739433b16.tar.gz
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/update.result6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/update.result b/mysql-test/r/update.result
index 6d2e623a6fb..beab6105f79 100644
--- a/mysql-test/r/update.result
+++ b/mysql-test/r/update.result
@@ -206,3 +206,9 @@ colC colA colD colE colF
3 4433 10005 492 500
DROP TABLE t1;
DROP TABLE t2;
+create table t1 (c1 int, c2 char(6), c3 int);
+create table t2 (c1 int, c2 char(6));
+insert into t1 values (1, "t1c2-1", 10), (2, "t1c2-2", 20);
+update t1 left join t2 on t1.c1 = t2.c1 set t2.c2 = "t2c2-1";
+update t1 left join t2 on t1.c1 = t2.c1 set t2.c2 = "t2c2-1" where t1.c3 = 10;
+drop table t1, t2;