From bab42f674d95186ccc7a3fdb4901fbb0b00a1b96 Mon Sep 17 00:00:00 2001
From: unknown <gluh@mysql.com/eagle.(none)>
Date: Mon, 26 Feb 2007 16:52:54 +0400
Subject: after merge fix

---
 mysql-test/r/insert_select.result | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'mysql-test/r/insert_select.result')

diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result
index 77420890053..18a0ed1a1cb 100644
--- a/mysql-test/r/insert_select.result
+++ b/mysql-test/r/insert_select.result
@@ -717,20 +717,6 @@ select * from t1;
 f1	f2
 1	2
 drop table t1;
-create table t1(f1 int primary key auto_increment, f2 int unique);
-insert into t1(f2) values(1);
-select @@identity;
-@@identity
-1
-insert ignore t1(f2) values(1);
-select @@identity;
-@@identity
-0
-insert ignore t1(f2) select 1;
-select @@identity;
-@@identity
-0
-drop table t1;
 CREATE TABLE t1 (f1 INT, f2 INT );
 CREATE TABLE t2  (f1 INT PRIMARY KEY, f2 INT);
 INSERT INTO t1 VALUES (1,1),(2,2),(10,10);
-- 
cgit v1.2.1