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