From b6553aacc2f78158a5896aa0d111ec82b9bcc409 Mon Sep 17 00:00:00 2001
From: unknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se>
Date: Wed, 24 May 2006 13:57:21 -0400
Subject: [PATCH] manual merge

---
 mysql-test/t/partition.test | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test
index f7ce146c109..f697005d6bd 100644
--- a/mysql-test/t/partition.test
+++ b/mysql-test/t/partition.test
@@ -1064,4 +1064,18 @@ ALTER TABLE t1 DISABLE KEYS;
 ALTER TABLE t1 ENABLE KEYS;
 DROP TABLE t1;
 
+#
+# Bug 17455 Partitions: Wrong message and error when using Repair/Optimize
+#                       table on partitioned table
+#
+create table t1 (a int)
+engine=MEMORY
+partition by key (a);
+
+REPAIR TABLE t1;
+OPTIMIZE TABLE t1;
+
+drop table t1;
+>>>>>>>
+
 --echo End of 5.1 tests