A test in subselect.test turned out to be correct after all, a difference between

5.0 and 4.1 (where it fails).


mysql-test/r/subselect.result:
  It turns out that it's correct that this test doesn't give an error in 5.0.
mysql-test/t/subselect.test:
  It turns out that it's correct that this test doesn't give an error in 5.0.

mysql-test/r/subselect.result

@@ -608,6 +608,14 @@ x
 3
 3
 INSERT INTO t1 (x) select (SELECT SUM(x)+2 FROM t1) FROM t2;
+select * from t1;
+x
+1
+2
+3
+3
+11
+11
 INSERT DELAYED INTO t1 (x) VALUES ((SELECT SUM(x) FROM t2));
 ERROR 42S22: Unknown column 'x' in 'field list'
 INSERT DELAYED INTO t1 (x) VALUES ((SELECT SUM(a) FROM t2));

mysql-test/t/subselect.test

@@ -351,9 +351,9 @@ INSERT DELAYED INTO t1 (x) VALUES ((SELECT SUM(a) FROM t2));
 select * from t1;
 INSERT INTO t1 (x) select (SELECT SUM(a)+1 FROM t2) FROM t2;
 select * from t1;
-# QQ This doesn't work right since the merge /pem 2003-07-09
-#-- error 1093
+# After this, only data based on old t1 records should have been added.
 INSERT INTO t1 (x) select (SELECT SUM(x)+2 FROM t1) FROM t2;
+select * from t1;
 -- error 1054
 INSERT DELAYED INTO t1 (x) VALUES ((SELECT SUM(x) FROM t2));
 INSERT DELAYED INTO t1 (x) VALUES ((SELECT SUM(a) FROM t2));