Commit 18250925 authored by kaa@polly.(none)'s avatar kaa@polly.(none)
Browse files

Merge polly.(none):/home/kaa/src/maint/bug31174/my41-bug31174 

into  polly.(none):/home/kaa/src/maint/mysql-4.1-maint
parents 9a0b9e03 f80541e3

myisam/sort.c

+4 −2
Original line number Diff line number Diff line
@@ -559,9 +559,10 @@ int thr_write_keys(MI_SORT_PARAM *sort_param) 
      if (!mergebuf)

      {

        length=param->sort_buffer_length;

        while (length >= MIN_SORT_MEMORY && !mergebuf)

        while (length >= MIN_SORT_MEMORY)

        {

          mergebuf=my_malloc(length, MYF(0));

          if ((mergebuf= my_malloc(length, MYF(0))))

              break;

          length=length*3/4;

        }

        if (!mergebuf)
@@ -897,6 +898,7 @@ merge_buffers(MI_SORT_PARAM *info, uint keys, IO_CACHE *from_file, 


  count=error=0;

  maxcount=keys/((uint) (Tb-Fb) +1);

  DBUG_ASSERT(maxcount > 0);

  LINT_INIT(to_start_filepos);

  if (to_file)

    to_start_filepos=my_b_tell(to_file);

mysql-test/r/repair.result

+27 −0
Original line number Diff line number Diff line
@@ -83,3 +83,30 @@ test.t1 repair status OK 
SET myisam_repair_threads=@@global.myisam_repair_threads;

SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;

DROP TABLE t1;

CREATE TABLE t1(a CHAR(255), KEY(a));

SET myisam_sort_buffer_size=4196;

INSERT INTO t1 VALUES

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0');

SET myisam_repair_threads=2;

REPAIR TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

SET myisam_repair_threads=@@global.myisam_repair_threads;

SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;

DROP TABLE t1;

End of 4.1 tests

mysql-test/t/repair.test

+30 −1
Original line number Diff line number Diff line
@@ -83,4 +83,33 @@ SET myisam_repair_threads=@@global.myisam_repair_threads; 
SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;

DROP TABLE t1;



# End of 4.1 tests
 
#

# BUG#31174 - "Repair" command on MyISAM crashes with small 

#              myisam_sort_buffer_size

#

CREATE TABLE t1(a CHAR(255), KEY(a));

SET myisam_sort_buffer_size=4196;

INSERT INTO t1 VALUES

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),('0'),

('0'),('0'),('0'),('0'),('0'),('0'),('0');

SET myisam_repair_threads=2;

REPAIR TABLE t1;

SET myisam_repair_threads=@@global.myisam_repair_threads;

SET myisam_sort_buffer_size=@@global.myisam_sort_buffer_size;

DROP TABLE t1;



--echo End of 4.1 tests