Commit b6553aac authored by unknown's avatar unknown
Browse files

manual merge

parent dcf8e0fe
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -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