into  pilot.mysql.com:/data/msvensson/mysql/bug31004/my51-bug31004


client/CMakeLists.txt:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
client/Makefile.am:
  Merge 5.0->5.1
client/mysqltest.c:
  Merge 5.0->5.1