diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-16 06:02:05 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-16 06:02:05 +0200 |
| commit | 0365e2d3dceccb1dc3727336e1596869e3c1a180 (patch) | |
| tree | d2fb03ef30e8182ca60cf1262a5a9db0e97a08a5 /isam | |
| parent | 9e67d0bec4c5d697c76ce05f12d424210ea0b656 (diff) | |
| download | mariadb-git-0365e2d3dceccb1dc3727336e1596869e3c1a180.tar.gz | |
Removed not used variable 'last_ref'
Fixed problem with negative DECIMAL() keys
Fixed some bugs with NULL keys in BDB
More mysql-test tests
Docs/manual.texi:
Changelog
client/mysqltest.c:
Added syntax: -- error #,#,...
heap/hp_info.c:
cleanup
include/thr_lock.h:
cleanup
isam/pack_isam.c:
cleanup
myisam/mi_check.c:
cleanup
myisam/mi_extra.c:
cleanup
myisammrg/myrg_rkey.c:
cleanup
mysql-test/mysql-test-run.sh:
Change to run test as root
mysql-test/r/bdb.result:
Many new tests
mysql-test/r/func_system.result:
Change to root user
mysql-test/t/bdb.test:
many more tests
mysql-test/t/create.test:
Change to work by test and root user
sql/field.cc:
Fixed problem with negative DECIMAL() keys
sql/filesort.cc:
cleanup
sql/ha_berkeley.cc:
Added purecoverage notes
Fixed some bugs with NULL keys
sql/init.cc:
cleanup
sql/mysql_priv.h:
cleanup
sql/mysqld.cc:
cleanup
sql/records.cc:
cleanup
sql/unireg.h:
cleanup
Diffstat (limited to 'isam')
| -rw-r--r-- | isam/pack_isam.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/isam/pack_isam.c b/isam/pack_isam.c index cadec5bcef5..c2cbb72cf74 100644 --- a/isam/pack_isam.c +++ b/isam/pack_isam.c @@ -576,7 +576,7 @@ static int compress(MRG_INFO *mrg,char *result_table) if (verbose && mrg->records) printf("Min record length: %6d Max length: %6d Mean total length: %6lu\n", mrg->min_pack_length,mrg->max_pack_length, - (ulong) new_length/mrg->records); + (ulong) (new_length/mrg->records)); if (!test_only) { @@ -763,11 +763,11 @@ static int get_statistic(MRG_INFO *mrg,HUFF_COUNTS *huff_counts) { global_count=count; if (!(element=tree_insert(&count->int_tree,pos,0)) || - (element->count == 1 && + ((element->count == 1 && count->tree_buff + tree_buff_length < - count->tree_pos + count->field_length || - count->field_length == 1 && - count->int_tree.elements_in_tree > 1)) + count->tree_pos + count->field_length) || + (count->field_length == 1 && + count->int_tree.elements_in_tree > 1))) { delete_tree(&count->int_tree); my_free(count->tree_buff,MYF(0)); @@ -862,7 +862,8 @@ static int get_statistic(MRG_INFO *mrg,HUFF_COUNTS *huff_counts) DBUG_RETURN(0); } -static int compare_huff_elements(void *not_used, byte *a, byte *b) +static int compare_huff_elements(void *not_used __attribute__((unused)), + byte *a, byte *b) { return *((my_off_t*) a) < *((my_off_t*) b) ? -1 : (*((my_off_t*) a) == *((my_off_t*) b) ? 0 : 1); |