diff options
| author | unknown <mats@romeo.(none)> | 2007-03-07 12:22:10 +0100 |
|---|---|---|
| committer | unknown <mats@romeo.(none)> | 2007-03-07 12:22:10 +0100 |
| commit | c75e3d7e886cca41b97f9d74dc5b7cab2c144fc9 (patch) | |
| tree | 2f1ac6a27476e0b8763fa23990fd7149936c8f77 /mysql-test/r/user_var-binlog.result | |
| parent | 4268313e50e8ebe69e1baaef4d84f54c2764dfb1 (diff) | |
| parent | a2f9bceac09b04352020478ac8d2ed8eb951b8e6 (diff) | |
| download | mariadb-git-c75e3d7e886cca41b97f9d74dc5b7cab2c144fc9.tar.gz | |
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/b22583-mysql-5.1-new-rpl
mysql-test/extra/binlog_tests/binlog.test:
Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/t/rpl_row_create_table.test:
Auto merged
sql/log_event.h:
Auto merged
mysql-test/r/binlog_row_binlog.result:
Manual merge
sql/log_event.cc:
Manual merge
sql/sql_class.cc:
Manual merge
Diffstat (limited to 'mysql-test/r/user_var-binlog.result')
0 files changed, 0 insertions, 0 deletions