into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-runtine-merge


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_base.cc:
  Auto merged