into  naruto.:C:/cpp/mysql-5.1-runtime


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