into  mysql.com:/home/kostja/mysql/mysql-5.0-10760-new


sql/handler.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged