into  mysql.com:/home/bar/mysql-5.1.b24747


mysql-test/r/xml.result:
  Auto merged
sql/item_xmlfunc.cc:
  Auto merged