summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2003-06-28 13:34:07 +0300
committerunknown <bell@sanja.is.com.ua>2003-06-28 13:34:07 +0300
commit4d4ddfde19eaefff041371416fe910391a1e505e (patch)
tree67c9c85078d4db9f17d1eddb68982af357077f0e
parente2d2432b44da9c2de1550fdf9e3bf236e379a484 (diff)
downloadmariadb-git-4d4ddfde19eaefff041371416fe910391a1e505e.tar.gz
merging
test moved to other bug
-rw-r--r--mysql-test/r/subselect.result7
-rw-r--r--mysql-test/t/subselect.test1
2 files changed, 3 insertions, 5 deletions
diff --git a/mysql-test/r/subselect.result b/mysql-test/r/subselect.result
index 32ff6f0df04..f3241e27173 100644
--- a/mysql-test/r/subselect.result
+++ b/mysql-test/r/subselect.result
@@ -608,7 +608,9 @@ x
3
3
INSERT INTO t1 (x) select (SELECT SUM(x)+2 FROM t1) FROM t2;
-Unknown column 'x' in 'field list'
+ERROR HY000: You can't specify target table 't1' for update in FROM clause
+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));
select * from t1;
x
@@ -1151,9 +1153,6 @@ INSERT INTO t1 VALUES (1,0,NULL,NULL),(2,0,NULL,NULL);
SELECT DISTINCT REF_ID FROM t1 WHERE ID= (SELECT DISTINCT REF_ID FROM t1 WHERE ID=2);
REF_ID
DROP TABLE t1;
-(SELECT 1 as a) UNION (SELECT 1) ORDER BY (SELECT a+0);
-a
-1
CREATE TABLE `t1` (
`id` mediumint(8) unsigned NOT NULL auto_increment,
`pseudo` varchar(35) NOT NULL default '',
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index 07bcb35242a..d77d49f303b 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -741,7 +741,6 @@ DROP TABLE t1;
#
# reduced subselect in ORDER BY & GROUP BY clauses
#
-(SELECT 1 as a) UNION (SELECT 1) ORDER BY (SELECT a+0);
CREATE TABLE `t1` (
`id` mediumint(8) unsigned NOT NULL auto_increment,