into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push


sql/mysqld.cc:
  Auto merged