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


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged