summaryrefslogtreecommitdiff
path: root/storage/heap/hp_rename.c
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-15 10:47:50 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-15 10:47:50 -0300
commit68e36030a0463da5f4728e36b30842ce22a109cb (patch)
treeac8b15ac65b08a492c256369b73e372f6568c7a4 /storage/heap/hp_rename.c
parent40eb558ffb1ceecf35806a108d37874526d50c40 (diff)
parent2543772a33a3bb8bf06f86bd5e56b52e91a77280 (diff)
downloadmariadb-git-68e36030a0463da5f4728e36b30842ce22a109cb.tar.gz
Merge of mysql-trunk-bugfixing into mysql-trunk-merge.
Diffstat (limited to 'storage/heap/hp_rename.c')
-rw-r--r--storage/heap/hp_rename.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/heap/hp_rename.c b/storage/heap/hp_rename.c
index c4e8390cc43..cf0d2b2b387 100644
--- a/storage/heap/hp_rename.c
+++ b/storage/heap/hp_rename.c
@@ -33,7 +33,7 @@ int heap_rename(const char *old_name, const char *new_name)
mysql_mutex_unlock(&THR_LOCK_heap);
DBUG_RETURN(my_errno);
}
- my_free(info->name,MYF(0));
+ my_free(info->name);
info->name=name_buff;
}
mysql_mutex_unlock(&THR_LOCK_heap);