merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except

those of davi.arnaut@sun.com-20090219210935-9vilvcisyyieffxl (TODO).
This commit is contained in:
Guilhem Bichot 2009-04-01 11:34:52 +02:00
commit c71aae73f6
405 changed files with 26858 additions and 5422 deletions

View file

@ -754,6 +754,8 @@ mysql-test/linux_sys_vars.inc
mysql-test/load_sysvars.inc
mysql-test/mtr
mysql-test/mysql-test-run
mysql-test/mysql-test-gcov.err
mysql-test/mysql-test-gcov.msg
mysql-test/mysql-test-run-shell
mysql-test/mysql-test-run.log
mysql-test/mysql_test_run_new