diff options
author | pem@mysql.telia.com <> | 2003-07-10 12:45:34 +0200 |
---|---|---|
committer | pem@mysql.telia.com <> | 2003-07-10 12:45:34 +0200 |
commit | 035a4629ae8a7b1b5fc5d1a2e87e7c85243ad01a (patch) | |
tree | 4cce5c5cd7180b5c3e9105b6e58e96def458d2a2 /mysql-test | |
parent | a8a29a39d27371613c862737f9ec1d56b9f48bf8 (diff) | |
download | mariadb-git-035a4629ae8a7b1b5fc5d1a2e87e7c85243ad01a.tar.gz |
A test in subselect.test turned out to be correct after all, a difference between
5.0 and 4.1 (where it fails).
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/subselect.result | 8 | ||||
-rw-r--r-- | mysql-test/t/subselect.test | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result index 7292230cf5e..3fe62d46e1c 100644 --- a/mysql-test/r/subselect.result +++ b/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)); diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test index 0be80c21c8d..0d9a485311f 100644 --- a/mysql-test/t/subselect.test +++ b/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)); |