into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqladmin.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/sp-destruct.test:
  Auto merged
client/mysqltest.c:
  Manual merge