into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged