BitKeeper/etc/ignore:
  added extra/mysql_waitpid
include/m_ctype.h:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
mysql-test/r/create.result:
  Auto merged
sql/item_strfunc.cc:
  Auto merged