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


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged