Commit 55edbd24 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fixed problem in myisampack with blobs

parent 85fe710b

myisam/myisamchk.c

+3 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static struct option long_options[] = 


static void print_version(void)

{

  printf("%s  Ver 1.50 for %s at %s\n",my_progname,SYSTEM_TYPE,

  printf("%s  Ver 1.51 for %s at %s\n",my_progname,SYSTEM_TYPE,

	 MACHINE_TYPE);

}
@@ -608,6 +608,7 @@ static int myisamchk(MI_CHECK *param, my_string filename) 
       info->s->state.header.file_version[3] != myisam_file_magic[3] ||

       (set_charset && set_charset->number != share->state.header.language)))

  {

    if (set_charset)

      check_param.language=set_charset->number;

    if (recreate_table(&check_param, &info,filename))

    {

myisam/myisampack.c

+2 −2
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static struct option long_options[] = 


static void print_version(void)

{

  printf("%s  Ver 1.9 for %s on %s\n",my_progname,SYSTEM_TYPE,MACHINE_TYPE);

  printf("%s  Ver 1.10 for %s on %s\n",my_progname,SYSTEM_TYPE,MACHINE_TYPE);

}



static void usage(void)
@@ -1670,7 +1670,7 @@ static int compress_isam_file(MRG_INFO *mrg, HUFF_COUNTS *huff_counts) 
      max_calc_length+=huff_counts[i].tree->height;

    else if (huff_counts[i].field_type == FIELD_BLOB ||

	     huff_counts[i].field_type == FIELD_VARCHAR)

      max_calc_length=huff_counts[i].tree->height*huff_counts[i].max_length + huff_counts[i].length_bits +1;

      max_calc_length+=huff_counts[i].tree->height*huff_counts[i].max_length + huff_counts[i].length_bits +1;

    else

      max_calc_length+=

	(huff_counts[i].field_length - huff_counts[i].max_zero_fill)*