diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index a4dd5f9a64e..71d4f1bb376 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -890,6 +890,10 @@ s1
 2
 3
 drop table t1;
+create table t1 (a int)
+partition by key (a)
+(partition p0 engine = MERGE);
+ERROR HY000: MyISAM Merge handler cannot be used in partitioned tables
 create table t1 (a int) engine=memory
 partition by key(a);
 insert into t1 values (1);
@@ -922,4 +926,14 @@ CREATE TABLE t1 (a int, index(a)) PARTITION BY KEY(a);
 ALTER TABLE t1 DISABLE KEYS;
 ALTER TABLE t1 ENABLE KEYS;
 DROP TABLE t1;
+create table t1 (a int)
+engine=MEMORY
+partition by key (a);
+REPAIR TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	repair	note	The storage engine for the table doesn't support repair
+OPTIMIZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	note	The storage engine for the table doesn't support optimize
+drop table t1;
 End of 5.1 tests
diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test
index 1a64537b6fc..f697005d6bd 100644
--- a/mysql-test/t/partition.test
+++ b/mysql-test/t/partition.test
@@ -1023,6 +1023,14 @@ insert into t1 values (1);
 create index inx1 on t1(a);
 drop table t1;
 
+#
+# BUG 19304 Partitions: MERGE handler not allowed in partitioned tables
+#
+--error ER_PARTITION_MERGE_ERROR
+create table t1 (a int)
+partition by key (a)
+(partition p0 engine = MERGE);
+
 #
 # BUG 19062 Partition clause ignored if CREATE TABLE ... AS SELECT ...;
 #
@@ -1056,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
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 7b9dd00ed56..af0556f1e6f 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -1108,8 +1108,7 @@ int ha_partition::handle_opt_partitions(THD *thd, HA_CHECK_OPT *check_opt,
                      part));
           if ((error= handle_opt_part(thd, check_opt, m_file[part], flag)))
           {
-            my_error(ER_GET_ERRNO, MYF(0), error);
-            DBUG_RETURN(TRUE);
+            DBUG_RETURN(error);
           }
         } while (++j < no_subparts);
       }
@@ -1118,8 +1117,7 @@ int ha_partition::handle_opt_partitions(THD *thd, HA_CHECK_OPT *check_opt,
         DBUG_PRINT("info", ("Optimize partition %u", i));
         if ((error= handle_opt_part(thd, check_opt, m_file[i], flag)))
         {
-          my_error(ER_GET_ERRNO, MYF(0), error);
-          DBUG_RETURN(TRUE);
+          DBUG_RETURN(error);
         }
       }
     }
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index 6761b28331e..0924a8adf6e 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -432,18 +432,22 @@ char *partition_info::has_unique_names()
 bool partition_info::check_engine_mix(handlerton **engine_array, uint no_parts)
 {
   uint i= 0;
-  bool result= FALSE;
   DBUG_ENTER("partition_info::check_engine_mix");
 
   do
   {
     if (engine_array[i] != engine_array[0])
     {
-      result= TRUE;
-      break;
+      my_error(ER_MIX_HANDLER_ERROR, MYF(0));
+      DBUG_RETURN(TRUE);
     }
   } while (++i < no_parts);
-  DBUG_RETURN(result);
+  if (engine_array[0] == &myisammrg_hton)
+  {
+    my_error(ER_PARTITION_MERGE_ERROR, MYF(0));
+    DBUG_RETURN(TRUE);
+  }
+  DBUG_RETURN(FALSE);
 }
 
 
@@ -757,10 +761,7 @@ bool partition_info::check_partition_info(handlerton **eng_type,
     } while (++i < no_parts);
   }
   if (unlikely(partition_info::check_engine_mix(engine_array, part_count)))
-  {
-    my_error(ER_MIX_HANDLER_ERROR, MYF(0));
     goto end;
-  }
 
   if (eng_type)
     *eng_type= (handlerton*)engine_array[0];
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index aa9cbaef36d..c5a9fb75eed 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5846,3 +5846,6 @@ ER_EVENT_MODIFY_QUEUE_ERROR
         eng "Internal scheduler error %d"
 ER_EVENT_SET_VAR_ERROR
         eng "Error during starting/stopping of the scheduler. Error code %u"
+ER_PARTITION_MERGE_ERROR
+        eng "MyISAM Merge handler cannot be used in partitioned tables"
+        swe "MyISAM Merge kan inte anändas i en partitionerad tabell"