diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-01 17:15:37 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-01 17:15:37 +0200 |
| commit | 4fed17727655091622b0244c9a127010cab719a9 (patch) | |
| tree | 80ada8364981cc5d65dec53d473583b35d07abe6 /mysql-test/t/rpl_rotate_logs.test | |
| parent | f5db9c9a5be0f2f7f78229e2b6054aae3d940c1c (diff) | |
| parent | e2965fb2628c9d4e557d755eeca0bc24b43fb353 (diff) | |
| download | mariadb-git-4fed17727655091622b0244c9a127010cab719a9.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug11316/my50-bug11316
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/type_newdecimal.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/create_select_tmp.test:
Auto merged
mysql-test/t/drop.test:
Auto merged
mysql-test/t/flush.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/innodb-deadlock.test:
Auto merged
mysql-test/t/innodb-lock.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/kill.test:
Auto merged
mysql-test/t/ndb_autodiscover2.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysql-test/t/rpl_EE_error.test:
Auto merged
mysql-test/t/rpl_change_master.test:
Auto merged
mysql-test/t/rpl_deadlock.test:
Auto merged
mysql-test/t/rpl_drop.test:
Auto merged
mysql-test/t/rpl_drop_temp.test:
Auto merged
mysql-test/t/rpl_error_ignored_table.test:
Auto merged
mysql-test/t/rpl_flush_log_loop.test:
Auto merged
mysql-test/t/rpl_insert_id.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/rpl_sp.test:
Auto merged
mysql-test/t/rpl_until.test:
Auto merged
mysql-test/t/strict.test:
Auto merged
mysql-test/t/type_newdecimal.test:
Auto merged
client/mysqltest.c:
Merge with --parsing-disabled
mysql-test/t/mysqltest.test:
Manual merge
Diffstat (limited to 'mysql-test/t/rpl_rotate_logs.test')
| -rw-r--r-- | mysql-test/t/rpl_rotate_logs.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl_rotate_logs.test b/mysql-test/t/rpl_rotate_logs.test index 26cb5ac8631..b125408d89e 100644 --- a/mysql-test/t/rpl_rotate_logs.test +++ b/mysql-test/t/rpl_rotate_logs.test @@ -103,7 +103,7 @@ show master logs; purge binary logs to 'master-bin.000002'; show binary logs; # sleeping 10 seconds or more would make the slave believe connection is down ---real_sleep 1; +--real_sleep 1 purge master logs before now(); show binary logs; insert into t2 values (65); |