into  mysql.com:/usr/home/bar/mysql-5.0.b18908


BitKeeper/etc/collapsed:
  auto-union
mysql-test/r/ctype_utf8.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged