into  production.mysql.com:/usersnfs/rburnett/mysql-5.1


libmysqld/libmysqld.def:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_select.cc:
  Auto merged