• unknown's avatar
    Merge with new version · ca42b36c
    unknown authored
    
    storage/myisam/mi_rsamepos.c:
      Auto merged
    include/m_string.h:
      Automatic merge
    include/maria.h:
      manual merge
    include/my_base.h:
      Automatic merge
    include/my_sys.h:
      Automatic merge
    mysys/mf_keycache.c:
      Automatic merge
    mysys/my_pread.c:
      Automatic merge
    sql/filesort.cc:
      Automatic merge
    sql/gen_lex_hash.cc:
      Automatic merge
    sql/mysqld.cc:
      Automatic merge
    sql/uniques.cc:
      Automatic merge
    storage/maria/Makefile.am:
      manual_merge
    storage/maria/ha_maria.cc:
      Automatic merge
    storage/maria/ma_check.c:
      manual merge
    storage/maria/ma_close.c:
      manual merge
    storage/maria/ma_create.c:
      manual merge
    storage/maria/ma_delete.c:
      manual merge
    storage/maria/ma_delete_all.c:
      Automatic merge
    storage/maria/ma_dynrec.c:
      manual merge
    storage/maria/ma_extra.c:
      Automatic merge
    storage/maria/ma_ft_boolean_search.c:
      manual merge
    storage/maria/ma_init.c:
      Automatic merge
    storage/maria/ma_key.c:
      manual merge
    storage/maria/ma_keycache.c:
      manual merge
    storage/maria/ma_locking.c:
      Automatic merge
    storage/maria/ma_open.c:
      manual merge
    storage/maria/ma_packrec.c:
      manual merge
    storage/maria/ma_page.c:
      Automatic merge
    storage/maria/ma_range.c:
      Automatic merge
    storage/maria/ma_rkey.c:
      manual merge
    storage/maria/ma_rsamepos.c:
      manual merge
    storage/maria/ma_sort.c:
      manual merge
    storage/maria/ma_statrec.c:
      Automatic merge
    storage/maria/ma_test2.c:
      Automatic merge
    storage/maria/ma_test3.c:
      Automatic merge
    storage/maria/ma_test_all.sh:
      Use new version
    storage/maria/ma_unique.c:
      Automatic merge
    storage/maria/ma_update.c:
      Automatic merge
    storage/maria/ma_write.c:
      manual merge
    storage/maria/maria_chk.c:
      manual merge
    storage/maria/maria_def.h:
      manual merge
      Added length pointer to _ma_page_get_block_info()
    storage/maria/maria_ftdump.c:
      Automatic merge
    storage/maria/maria_pack.c:
      manual merge
    storage/myisam/mi_check.c:
      Automatic merge
    storage/myisam/mi_create.c:
      Automatic merge
    storage/myisam/mi_test2.c:
      Automatic merge
    storage/myisam/sort.c:
      Automatic merge
    ca42b36c
ma_update.c 7.37 KB