mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-10 09:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed indention, removed compiler varnings and fixed a bug

Browse source 
in FULLTEXT indexes.


Docs/manual.texi:
  Removed some @ifset nushere tags which crashed the manual
  when using emacs
client/mysql-test.c:
  ***MISSING WEAVE***
heap/hp_test2.c:
  Removed compiler warnings
isam/pack_isam.c:
  Removed compiler warnings
isam/update.c:
  Removed compiler warnings
myisam/ft_parser.c:
  cleanup
myisam/ft_update.c:
  Fixed crash when inserting a blob which was NULL
myisam/mi_check.c:
  -e continues checking of other keys on error
myisam/mi_rkey.c:
  cleanup
myisam/myisamchk.c:
  cleanup
myisam/myisamlog.c:
  Added use of rnd to make things more predictable
myisammrg/myrg_rkey.c:
  Removed compiler warnings
mysys/mf_pack.c:
  cleanup
mysys/my_fstream.c:
  cleanup
sql/ha_berkeley.cc:
  cleanup
sql/handler.cc:
  cleanup
sql/item_func.cc:
  cleanup
sql/item_func.h:
  cleanup
sql/net_serv.cc:
  cleanup
sql/slave.cc:
  cleanup
sql/sql_class.cc:
  cleanup
sql/sql_show.cc:
  cleanup
This commit is contained in:
unknown 2000-09-29 00:58:16 +03:00
commit c33289a3a1
21 changed files with 351 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

18
isam/pack_isam.c
View file

@ -574,9 +574,9 @@ static int compress(MRG_INFO *mrg,char *result_table)
end_file_buffer();
if (verbose && mrg->records)
printf("Min record length: %6d Max length: %6d Mean total length: %6d\n",
printf("Min record length: %6d Max length: %6d Mean total length: %6lu\n",
mrg->min_pack_length,mrg->max_pack_length,
(long) 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 &&
count->tree_buff + tree_buff_length <
count->tree_pos + count->field_length ||
count->field_length == 1 &&
count->int_tree.elements_in_tree > 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))
{
delete_tree(&count->int_tree);
my_free(count->tree_buff,MYF(0));
@ -1760,8 +1760,8 @@ static int compress_isam_file(MRG_INFO *mrg, HUFF_COUNTS *huff_counts)
if (max_record_length >= max_allowed_length)
{
fprintf(stderr,
"Error: Found record with packed-length: %d, max is: %d\n",
max_record_length,max_allowed_length);
"Error: Found record with packed-length: %d, max is: %lu\n",
max_record_length, (ulong) max_allowed_length);
error=1;
break;
}