into  pilot.blaudden:/home/msvensson/mysql/bug24121/my51-bug24121


client/mysqltest.c:
  Auto merged
sql-common/client.c:
  Auto merged