-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines myisammrg/myrg_open.c: Auto merged mysql-test/r/merge.result: Manual merge. mysql-test/t/merge.test: Manual merge.
a93e2871
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines myisammrg/myrg_open.c: Auto merged mysql-test/r/merge.result: Manual merge. mysql-test/t/merge.test: Manual merge.