Commit 1632c3bb authored by unknown's avatar unknown

Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
BitKeeper/deleted/.del-show_binlog_events.inc:
  Delete: mysql-test/include/show_binlog_events.inc
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Merge 5.0->5.1(preserving 5.1 file)
parents f7cc6d16 928e00b8
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment