Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Manual merge 5.1 uses replace_regex, keep those