• unknown's avatar
    merge from MyISAM into Maria (last step of merge of 5.1 into Maria). · 3411bfe0
    unknown authored
    Tests: "maria" and "ps_maria" fail like before merge (assertions),
    "ma_test_all" fails like before merge (ma_test2 segfaults, I'll try
    to find out why).
    
    
    mysys/mf_pagecache.c:
      using a more distinctive tag
    storage/maria/ha_maria.cc:
      merge from MyISAM into Maria
    storage/maria/ma_check.c:
      merge from MyISAM into Maria
    storage/maria/ma_close.c:
      TODO as a word
    storage/maria/ma_create.c:
      merge from MyISAM into Maria
    storage/maria/ma_delete_all.c:
      TODO as a word
    storage/maria/ma_delete_table.c:
      TODO as a word
    storage/maria/ma_dynrec.c:
      merge from MyISAM into Maria
    storage/maria/ma_extra.c:
      merge from MyISAM into Maria
    storage/maria/ma_ft_boolean_search.c:
      merge from MyISAM into Maria
    storage/maria/ma_locking.c:
      merge from MyISAM into Maria
    storage/maria/ma_loghandler.c:
      fix for compiler warning
    storage/maria/ma_open.c:
      merge from MyISAM into Maria.
      I will ask Monty to check the ASKMONTY-marked piece of code.
    storage/maria/ma_packrec.c:
      merge from MyISAM into Maria
    storage/maria/ma_range.c:
      merge from MyISAM into Maria
    storage/maria/ma_rename.c:
      TODO as a word
    storage/maria/ma_rt_index.c:
      merge from MyISAM into Maria
    storage/maria/ma_rt_split.c:
      merge from MyISAM into Maria
    storage/maria/ma_search.c:
      merge from MyISAM into Maria
    storage/maria/ma_sort.c:
      merge from MyISAM into Maria
    storage/maria/ma_update.c:
      merge from MyISAM into Maria
    storage/maria/ma_write.c:
      merge from MyISAM into Maria
    storage/maria/maria_chk.c:
      merge from MyISAM into Maria
    storage/maria/maria_def.h:
      merge from MyISAM into Maria
    storage/maria/maria_pack.c:
      merge from MyISAM into Maria
    storage/maria/unittest/ma_test_loghandler_pagecache-t.c:
      fix for compiler warning
    storage/myisam/ha_myisam.cc:
      merge from MyISAM into Maria
    storage/myisammrg/ha_myisammrg.cc:
      merge from MyISAM into Maria
    3411bfe0
maria_pack.c 101 KB