into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930


mysql-test/mysql-test-run.pl:
  Auto merged
client/mysqltest.c:
  Manual merge, will add ramils patch afterwards