Merge of mysql-trunk-bugfixing into mysql-trunk-merge.

1 files changed, 2 insertions, 2 deletions

diff --git a/storage/heap/ha_heap.cc b/storage/heap/ha_heap.cc
index 541650bd5e8..350958f8230 100644
--- a/storage/heap/ha_heap.cc
+++ b/storage/heap/ha_heap.cc
@@ -112,7 +112,7 @@ int ha_heap::open(const char *name, int mode, uint test_if_locked)
     create_info.pin_share= TRUE;
 
     rc= heap_create(name, &create_info, &internal_share, &created_new_share);
-    my_free((uchar*) create_info.keydef, MYF(0));
+    my_free(create_info.keydef);
     if (rc)
       goto end;
 
@@ -764,7 +764,7 @@ int ha_heap::create(const char *name, TABLE *table_arg,
   hp_create_info.auto_increment= (create_info->auto_increment_value ?
 				  create_info->auto_increment_value - 1 : 0);
   error= heap_create(name, &hp_create_info, &internal_share, &created);
-  my_free((uchar*) hp_create_info.keydef, MYF(0));
+  my_free(hp_create_info.keydef);
   DBUG_ASSERT(file == 0);
   return (error);
 }