into mysql.com:/home/my/mysql-4.1


sql/handler.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged