• unknown's avatar
    Merge of changes in MyISAM since December 16 -> April 1 · 3651e328
    unknown authored
    Fixes bugs:
    Bug#28837  MyISAM storage engine error (134) doing delete with self-join
    Bug#31277  myisamchk --unpack corrupts table
    Bug#4692   DISABLE/ENABLE KEYS waste a space
    Bug#31305  myisam tables crash when they are near capacity
    
    
    BitKeeper/etc/ignore:
      added unittest/tmp/*
    mysql-test/r/maria.result:
      Moved missing tests from myisam.test to maria.test
    mysql-test/t/maria.test:
      Moved missing tests from myisam.test to maria.test
    storage/maria/ha_maria.cc:
      Merge of changes in MyISAM since December 16 -> April 1
      Fixes bug in self join (Bug#28837: MyISAM storage engine error (134) doing delete with self-join)
    storage/maria/ha_maria.h:
      Merge of changes in MyISAM since December 16 -> April 1
    storage/maria/ma_blockrec.c:
      Merge of changes in MyISAM since December 16 -> April 1
      Fixes bug in self join (Bug#28837: MyISAM storage engine error (134) doing delete with self-join)
      The problem is that we may be using a cached key page with old information. Versioning will fix this
    storage/maria/ma_check.c:
      Merge of changes in MyISAM since December 16 -> April 1
      This fixes a problem with pack_reclength not beeing big enough (Bug #31277 myisamchk --unpack corrupts table)
      BUG#4692 - DISABLE/ENABLE KEYS waste a space
    storage/maria/ma_delete.c:
      Indentation fixes
    storage/maria/ma_dynrec.c:
      Merge of changes in MyISAM since December 16 -> April 1
      Fixes Bug#31305 myisam tables crash when they are near capacity.
      (This uses a simpler fix than in MyISAM by remembering the length of the current row)
    storage/maria/ma_ft_boolean_search.c:
      Merge of all changes from myisam/ft_boolean_search.c (This file had not been kept up to date)
    storage/maria/ma_open.c:
      Merge of changes in MyISAM since December 16 -> April 1
      Calculate default_rec_buff_size more exact to be sure it's always big enough
    storage/maria/ma_packrec.c:
      Merge of changes in MyISAM since December 16 -> April 1
      Update default_rec_buff_size to be big enough to hold one packed row
      Related to Bug#31277 myisamchk --unpack corrupts table
    storage/maria/ma_rnext_same.c:
      Indentation fixes
    storage/maria/ma_rt_index.c:
      Merge of changes in MyISAM since December 16 -> April 1
    storage/maria/ma_rt_mbr.c:
      Merge of changes in MyISAM since December 16 -> April 1
      (Added comment)
    storage/maria/ma_search.c:
      Merge of changes in MyISAM since December 16 -> April 1
      (Added comment)
    storage/maria/ma_sort.c:
      Merge of changes in MyISAM since December 16 -> April 1
    storage/maria/ma_statrec.c:
      Indentation fixes
    storage/maria/ma_test2.c:
      Indentation fixes
    storage/maria/maria_chk.c:
      Indentation fixes
    storage/maria/maria_pack.c:
      Merge of changes in MyISAM since December 16 -> April 1
    3651e328
ma_check.c 213 KB