into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new


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