diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-08 11:31:42 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-08 11:31:42 +0200 |
| commit | 1632c3bb739bcddc2679e4c18f6864a1cd0d67b1 (patch) | |
| tree | 3d823b888b181214b72452d09027fc2e9752f8cd /mysql-test/mysql-test-run.pl | |
| parent | f7cc6d167e622ed6b3d2aee85cd6eeb52ceb06bc (diff) | |
| parent | 928e00b8d860fd55d60bd4f38336220af30c121f (diff) | |
| download | mariadb-git-1632c3bb739bcddc2679e4c18f6864a1cd0d67b1.tar.gz | |
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)
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
0 files changed, 0 insertions, 0 deletions