• unknown's avatar
    merging MyISAM changes into Maria (not done in 5.1->maria merge of · a3d2ae46
    unknown authored
    Jul 7th). "maria.test" and "ps_maria.test" still fail;
    "ma_test_all" starts failing (MyISAM has the same issue see BUG#30094).
    
    
    include/maria.h:
      merging MyISAM changes into Maria
    mysys/mf_keycache.c:
      mi_test_all showed "floating point exception", this was already
      fixed in the latest 5.1, importing fix.
    sql/item_xmlfunc.cc:
      compiler warning (already fixed in latest 5.1)
    storage/maria/ha_maria.cc:
      merging MyISAM changes into Maria. See #ifdef ASK_MONTY.
    storage/maria/ha_maria.h:
      merging MyISAM changes into Maria
    storage/maria/ma_cache.c:
      merging MyISAM changes into Maria
    storage/maria/ma_check.c:
      merging MyISAM changes into Maria
    storage/maria/ma_create.c:
      merging MyISAM changes into Maria
    storage/maria/ma_dynrec.c:
      merging MyISAM changes into Maria
    storage/maria/ma_extra.c:
      merging MyISAM changes into Maria
    storage/maria/ma_ft_boolean_search.c:
      merging MyISAM changes into Maria
    storage/maria/ma_ft_nlq_search.c:
      merging MyISAM changes into Maria
    storage/maria/ma_info.c:
      merging MyISAM changes into Maria
    storage/maria/ma_key.c:
      merging MyISAM changes into Maria
    storage/maria/ma_loghandler.c:
      compiler warning (part->length is size_t)
    storage/maria/ma_open.c:
      merging MyISAM changes into Maria
    storage/maria/ma_preload.c:
      merging MyISAM changes into Maria
    storage/maria/ma_range.c:
      merging MyISAM changes into Maria
    storage/maria/ma_rkey.c:
      merging MyISAM changes into Maria
    storage/maria/ma_rt_index.c:
      merging MyISAM changes into Maria
    storage/maria/ma_rt_key.c:
      merging MyISAM changes into Maria
    storage/maria/ma_rt_split.c:
      merging MyISAM changes into Maria
    storage/maria/ma_search.c:
      merging MyISAM changes into Maria
    storage/maria/ma_sort.c:
      merging MyISAM changes into Maria
    storage/maria/maria_def.h:
      merging MyISAM changes into Maria
    a3d2ae46
ma_extra.c 15.2 KB