diff options
| author | Luis Soares <luis.soares@sun.com> | 2009-01-29 17:59:46 +0100 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2009-01-29 17:59:46 +0100 |
| commit | f7a24d72dc7a86341da4634f6d1a71f1ea77000b (patch) | |
| tree | 8d85cb3a0751a1e96d745ddddbe4602094984d03 /mysql-test/suite/rpl/r/rpl_flushlog_loop.result | |
| parent | d41cae03d7c0cc693aac193c7d7cf186e40ea7db (diff) | |
| parent | 88a36a21574a5fd5d4a13f0fb2bfb1fd10abebb5 (diff) | |
| download | mariadb-git-f7a24d72dc7a86341da4634f6d1a71f1ea77000b.tar.gz | |
merge: 5.1 -> 5.1-rpl-merge
conflicts:
Text conflict in mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
Text conflict in mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_flushlog_loop.result')
0 files changed, 0 insertions, 0 deletions