into  neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace


client/mysqltest.c:
  Auto merged