aftermerge fix

8e80431f · bell@sanja.is.com.ua · 74ddfaad · 8e80431f
Commit 8e80431f authored Nov 02, 2003 by bell@sanja.is.com.ua
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/t/subselect.test mysql-test/t/subselect.test +1 -1

No files found.
--- 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;