-
unknown authored
into stella.local:/home2/mydev/mysql-5.1-axmrg mysql-test/t/myisam.test: Auto merged storage/myisam/mi_open.c: Auto merged mysql-test/r/myisam.result: Manual merge from 5.0
543cee3e
into stella.local:/home2/mydev/mysql-5.1-axmrg mysql-test/t/myisam.test: Auto merged storage/myisam/mi_open.c: Auto merged mysql-test/r/myisam.result: Manual merge from 5.0