-
unknown authored
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27130 mysql-test/r/func_str.result: Manual merge mysql-test/t/func_str.test: Manual merge
145696de
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27130 mysql-test/r/func_str.result: Manual merge mysql-test/t/func_str.test: Manual merge