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


mysql-test/r/partition_error.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
mysql-test/r/partition.result:
  Auto merged