into  naruto.:C:/cpp/bug20777/my51-bug20777


mysql-test/t/sp.test:
  Auto merged
sql/item_func.h:
  Auto merged
mysql-test/r/sp.result:
  Manual merge
sql/item_func.cc:
  Manual merge