From 410086b347ee512e1e337debde13a0ff418b85ed Mon Sep 17 00:00:00 2001
From: "timour@mysql.com" <>
Date: Thu, 16 Dec 2004 18:46:38 +0200
Subject: [PATCH] Test for BUG#6054. The bug itsel is fixed by the fix for
 #5837.

---
 mysql-test/r/update.result | 6 ++++++
 mysql-test/t/update.test   | 9 +++++++++
 2 files changed, 15 insertions(+)

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;
diff --git a/mysql-test/t/update.test b/mysql-test/t/update.test
index aeefa3c33f5..704263b1216 100644
--- a/mysql-test/t/update.test
+++ b/mysql-test/t/update.test
@@ -161,3 +161,12 @@ SELECT * FROM t2;
 DROP TABLE t1;
 DROP TABLE t2;
 
+#
+# Bug #6054 
+#
+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;