manual merge

b6553aac · unknown · dcf8e0fe · b6553aac
Commit b6553aac authored May 24, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 0 deletions

mysql-test/t/partition.test mysql-test/t/partition.test +14 -0

No files found.
--- 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