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


mysql-test/r/cast.result:
  Auto merged
sql/item_func.cc:
  Auto merged