diff options
author | Andrei Elkin <aelkin@mysql.com> | 2009-10-01 20:22:44 +0300 |
---|---|---|
committer | Andrei Elkin <aelkin@mysql.com> | 2009-10-01 20:22:44 +0300 |
commit | 737910fb11e0fe8d2628bf8091c3a7b0de194db2 (patch) | |
tree | 4fc7c06ce588219a390c0beaf37745e0903d2546 /mysql-test/suite/rpl/r/rpl_flushlog_loop.result | |
parent | d91aa57c38e9baf0bbf31a596e79bea2504e50bb (diff) | |
parent | a367c88c9eef26242756efa4026962c71c5429a9 (diff) | |
download | mariadb-git-737910fb11e0fe8d2628bf8091c3a7b0de194db2.tar.gz |
merge from 5.1-rpl+2 repo to a local branch with HB and bug@27808 fixes
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_flushlog_loop.result')
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_flushlog_loop.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result index 3ebd1ac27a4..5e74a4eb999 100644 --- a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result +++ b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result @@ -10,6 +10,7 @@ relay_log MYSQLD_DATADIR/relay-log relay_log_index relay_log_info_file relay-log.info relay_log_purge ON +relay_log_recovery OFF relay_log_space_limit 0 stop slave; change master to master_host='127.0.0.1',master_user='root', |