summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorunknown <gluh@mysql.com/eagle.(none)>2007-02-26 16:52:54 +0400
committerunknown <gluh@mysql.com/eagle.(none)>2007-02-26 16:52:54 +0400
commitbab42f674d95186ccc7a3fdb4901fbb0b00a1b96 (patch)
tree18a8e98d0082cdf6308374068d3790ba225348bc /mysql-test/t
parentb10600528dfd92a4d1dcd5d3bff1e0c0f41672a8 (diff)
downloadmariadb-git-bab42f674d95186ccc7a3fdb4901fbb0b00a1b96.tar.gz
after merge fix
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/insert_select.test13
-rw-r--r--mysql-test/t/subselect.test4
2 files changed, 1 insertions, 16 deletions
diff --git a/mysql-test/t/insert_select.test b/mysql-test/t/insert_select.test
index 93a7a3e5ab8..0f9a0ca4872 100644
--- a/mysql-test/t/insert_select.test
+++ b/mysql-test/t/insert_select.test
@@ -281,19 +281,6 @@ select * from t1;
drop table t1;
#
-# Bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT if no rows
-# were inserted.
-#
-create table t1(f1 int primary key auto_increment, f2 int unique);
-insert into t1(f2) values(1);
-select @@identity;
-insert ignore t1(f2) values(1);
-select @@identity;
-insert ignore t1(f2) select 1;
-select @@identity;
-drop table t1;
-
-#
# Bug#16630: wrong result, when INSERT t1 SELECT ... FROM t1 ON DUPLICATE
#
CREATE TABLE t1 (f1 INT, f2 INT );
diff --git a/mysql-test/t/subselect.test b/mysql-test/t/subselect.test
index abf6273ad7e..0ce3d1d78c6 100644
--- a/mysql-test/t/subselect.test
+++ b/mysql-test/t/subselect.test
@@ -2599,8 +2599,6 @@ SELECT * FROM t1
WHERE EXISTS (SELECT t2.c FROM t2 JOIN t3 ON t2.c=t3.c WHERE t2.c=1
UNION
SELECT c from t2 WHERE c=t1.c);
-
-
DROP TABLE t1,t2,t3;
#
@@ -2610,7 +2608,7 @@ CREATE TABLE t1 (s1 char(1));
INSERT INTO t1 VALUES ('a');
SELECT * FROM t1 WHERE _utf8'a' = ANY (SELECT s1 FROM t1);
DROP TABLE t1;
-DROP TABLE t1,t2,t3;
+
#
# Bug#23800: Outer fields in correlated subqueries is used in a temporary
# table created for sorting.