From 8b7ba1cfa32ea51801961308c80838f4fe05a7a0 Mon Sep 17 00:00:00 2001
From: unknown <bell@sanja.is.com.ua>
Date: Sun, 2 Nov 2003 17:21:32 +0200
Subject: [PATCH] aftermerge fix

---
 mysql-test/t/subselect.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 9297573a6db..bb8b4db2b62 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -693,7 +693,7 @@ INSERT INTO t1 VALUES (1);
 UPDATE t1 SET i=i+(SELECT MAX(i) FROM (SELECT 1) t) WHERE i=(SELECT MAX(i));
 -- error 1111
 UPDATE t1 SET i=i+1 WHERE i=(SELECT MAX(i));
--- error 1054
+-- error 1109
 UPDATE t1 SET t.i=i+(SELECT MAX(i) FROM (SELECT 1) t);
 drop table t1;