mysql-test/t/func_str.test:
  Remove duplicated test that crept in during merge
mysql-test/r/func_str.result:
  Update results