after merge fixes mysql-test/r/func_group.result: after merge fixes mysql-test/r/func_str.result: after merge fixes mysql-test/t/func_group.test: after merge fixes