From 61384518639d163f06a93cbab4bccfd7a77fe0a6 Mon Sep 17 00:00:00 2001
From: vasil <Unknown>
Date: Fri, 24 Oct 2008 09:36:14 +0000
Subject: [PATCH] branches/zip:

Remove a statement that causes the innodb-index test to fail.

The change in behavior was introduced in MySQL BZR-r2738.

Suggested by:	Marko
---
 mysql-test/innodb-index.result | 2 --
 mysql-test/innodb-index.test   | 2 --
 2 files changed, 4 deletions(-)

diff --git a/mysql-test/innodb-index.result b/mysql-test/innodb-index.result
index 21e15705b33..a476d16a5f0 100644
--- a/mysql-test/innodb-index.result
+++ b/mysql-test/innodb-index.result
@@ -69,8 +69,6 @@ t1	CREATE TABLE `t1` (
 explain select * from t1 force index(c) order by c;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	NULL	c	10	NULL	4	
-drop index c on t1;
-ERROR 42000: This table type requires a primary key
 alter table t1 add primary key (a), drop index c;
 show create table t1;
 Table	Create Table
diff --git a/mysql-test/innodb-index.test b/mysql-test/innodb-index.test
index 07f709eee38..0ca02f0538a 100644
--- a/mysql-test/innodb-index.test
+++ b/mysql-test/innodb-index.test
@@ -30,8 +30,6 @@ drop table `t1#2`;
 alter table t1 add unique index (c), add index (d);
 show create table t1;
 explain select * from t1 force index(c) order by c;
---error ER_REQUIRES_PRIMARY_KEY
-drop index c on t1;
 alter table t1 add primary key (a), drop index c;
 show create table t1;
 --error ER_MULTIPLE_PRI_KEY