diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 10:47:50 -0300 |
| commit | 649390ac814ce5ea1e77b833ab5fe92dfcfe86d5 (patch) | |
| tree | ac8b15ac65b08a492c256369b73e372f6568c7a4 /storage/myisam/mi_write.c | |
| parent | 06b8897e8e9a27b6ffc562af90153ab63f30e63e (diff) | |
| parent | 8df20918d6751dc1eeb47ab722269dbd9d2da297 (diff) | |
| download | mariadb-git-649390ac814ce5ea1e77b833ab5fe92dfcfe86d5.tar.gz | |
Merge of mysql-trunk-bugfixing into mysql-trunk-merge.
Diffstat (limited to 'storage/myisam/mi_write.c')
| -rw-r--r-- | storage/myisam/mi_write.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/mi_write.c b/storage/myisam/mi_write.c index 5b46db111b3..f2d43585eef 100644 --- a/storage/myisam/mi_write.c +++ b/storage/myisam/mi_write.c @@ -286,7 +286,7 @@ int _mi_ck_write_btree(register MI_INFO *info, uint keynr, uchar *key, if (!error) error= _mi_ft_convert_to_ft2(info, keynr, key); delete_dynamic(info->ft1_to_ft2); - my_free((uchar*)info->ft1_to_ft2, MYF(0)); + my_free(info->ft1_to_ft2); info->ft1_to_ft2=0; } DBUG_RETURN(error); @@ -1045,7 +1045,7 @@ void mi_end_bulk_insert(MI_INFO *info) delete_tree(& info->bulk_insert[i]); } } - my_free((void *)info->bulk_insert, MYF(0)); + my_free(info->bulk_insert); info->bulk_insert=0; } } |