• unknown's avatar
    Completion of merge of mysql-5.1 into mysql-maria. · 99c431db
    unknown authored
    Manually imported changes done to MyISAM (include/myisam.h,
    storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test,
    mysql-test/t/ps_2myisam.test) the last
    months into Maria (tedious, should do it more frequently in the
    future), including those not done at the previous 5.1->Maria merge
    (please in the future don't forget to apply MyISAM changes to Maria
    when you merge 5.1 into Maria).
    Note: I didn't try to import anything which could be MyISAM-related
    in other tests of mysql-test (I didn't want to dig in all csets),
    but as QA is working to make most tests re-usable for other engines
    (Falcon), it is likely that we'll benefit from this and just have
    to set engine=Maria somewhere to run those tests on Maria.
    func_group and partition tests fail but they already do in main 5.1
    on my machine. No Valgrind error in t/*maria*.test.
    Monty: please see the commit comment of maria.result and check.
    
    
    BitKeeper/deleted/.del-ha_maria.m4:
      Delete: config/ac-macros/ha_maria.m4
    configure.in:
      fix for the new way of enabling engines
    include/maria.h:
      importing changes done to MyISAM the last months into Maria
    include/my_handler.h:
      importing changes done to MyISAM the last months into Maria
    include/myisam.h:
      importing changes done to MyISAM the last months into Maria
    mysql-test/r/maria.result:
      identical to myisam.result, except the engine name in some places
      AND in the line testing key_block_size=1000000000000000000:
      Maria gives a key block size of 8192 while MyISAM gives 4096;
      is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH
      and the same constant in MyISAM? Monty?
    mysql-test/r/ps_maria.result:
      identical to ps_2myisam.result (except the engine name in some places)
    mysql-test/t/maria.test:
      instead of engine=maria everywhere, I use @@storage_engine (reduces
      the diff with myisam.test).
      importing changes done to MyISAM the last months into Maria
    mysys/my_handler.c:
      importing changes done to MyISAM the last months into Maria
    sql/ha_maria.cc:
      importing changes done to MyISAM the last months into Maria
    sql/ha_maria.h:
      importing changes done to MyISAM the last months into Maria
    sql/mysqld.cc:
      unneeded
    storage/maria/Makefile.am:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_check.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_create.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_delete_table.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_dynrec.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_extra.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_ft_boolean_search.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_ft_eval.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_ft_nlq_search.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_ft_parser.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_ft_test1.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_ft_update.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_ftdefs.h:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_key.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_open.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_page.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_rkey.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_rsamepos.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_rt_index.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_rt_mbr.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_search.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_sort.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_test1.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_test2.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_test3.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_update.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/ma_write.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/maria_chk.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/maria_def.h:
      importing changes done to MyISAM the last months into Maria
    storage/maria/maria_ftdump.c:
      importing changes done to MyISAM the last months into Maria
    storage/maria/maria_pack.c:
      importing changes done to MyISAM the last months into Maria
    99c431db
ma_ftdefs.h 6.27 KB