Merge four.local.lan:/WORK2/merge/mysql-5.0-build-datadict
into four.local.lan:/WORK2/merge/mysql-5.1-build-datadict It is to be expected that a post merge fix is needed. mysql-test/suite/funcs_1/README.txt: Auto merged mysql-test/suite/funcs_1/t/innodb__datadict.test: Auto merged mysql-test/suite/funcs_1/t/memory__datadict.test: Auto merged mysql-test/suite/funcs_1/t/myisam__datadict.test: Auto merged mysql-test/suite/funcs_1/datadict/datadict_master.inc: Manual merge mysql-test/suite/funcs_1/r/innodb__datadict.result: Manual merge mysql-test/suite/funcs_1/r/memory__datadict.result: Manual merge mysql-test/suite/funcs_1/r/myisam__datadict.result: Manual merge
Showing
Please register or sign in to comment