into  mysql.com:/data0/mysqldev/my/mysql-5.1-release


extra/comp_err.c:
  Auto merged
mysql-test/r/ctype_sjis.result:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  merged