into  magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt-merge-5.1-opt


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged