into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1


sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged