into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt


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