diff options
| author | unknown <serg@serg.mylan> | 2005-01-24 19:41:42 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-24 19:41:42 +0100 |
| commit | a82fd1eaec9067bbed9cceb9294734a8d09b72da (patch) | |
| tree | 0c73a61f5c88d003eae464001af7656745e9ba4e /myisam/mi_packrec.c | |
| parent | 7eb825a07280dfeb1bae3def25a3bc0add544a74 (diff) | |
| parent | 7109999b92ec8541a61ca5babc5b06f4315478a8 (diff) | |
| download | mariadb-git-a82fd1eaec9067bbed9cceb9294734a8d09b72da.tar.gz | |
merged
BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4:
Auto merged
client/mysql.cc:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/mi_packrec.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/tztime.cc:
Auto merged
tests/client_test.c:
Auto merged
Diffstat (limited to 'myisam/mi_packrec.c')
| -rw-r--r-- | myisam/mi_packrec.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/myisam/mi_packrec.c b/myisam/mi_packrec.c index 62d15c03266..a8a27858d79 100644 --- a/myisam/mi_packrec.c +++ b/myisam/mi_packrec.c @@ -184,21 +184,14 @@ my_bool _mi_read_pack_info(MI_INFO *info, pbool fix_keys) my_malloc((length+OFFSET_TABLE_SIZE)*sizeof(uint16)+ (uint) (share->pack.header_length+7), MYF(MY_WME | MY_ZEROFILL)))) - { - my_free((gptr) share->decode_trees,MYF(0)); goto err1; - } tmp_buff=share->decode_tables+length; disk_cache=(byte*) (tmp_buff+OFFSET_TABLE_SIZE); if (my_read(file,disk_cache, (uint) (share->pack.header_length-sizeof(header)), MYF(MY_NABP))) - { - my_free((gptr) share->decode_trees,MYF(0)); - my_free((gptr) share->decode_tables,MYF(0)); goto err2; - } huff_tree_bits=max_bit(trees ? trees-1 : 0); init_bit_buffer(&bit_buff, (uchar*) disk_cache, |