mirror of
https://github.com/MariaDB/server.git
synced 2025-01-24 07:44:22 +01:00
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)
This commit is contained in:
commit
1632c3bb73