into  polly.local:/home/kaa/src/maint/mysql-5.1-maint


mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Manual merge