summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <serg@sergbook.mylan>2003-07-14 00:18:03 +0200
committerunknown <serg@sergbook.mylan>2003-07-14 00:18:03 +0200
commitf1e3a929e844d13bd1e2e51aba19ccc0ea5659a5 (patch)
tree45e3ee639fa7b0871f5b5ace51588fb64076ae65 /mysql-test
parent97d9742f1030f44f62c58219adcd7b6c58bd23c8 (diff)
parent768ab1e47e363dffc8ee450d48ebbf976efb3d65 (diff)
downloadmariadb-git-f1e3a929e844d13bd1e2e51aba19ccc0ea5659a5.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/rpl_rotate_logs.result7
-rw-r--r--mysql-test/t/rpl_rotate_logs.test5
2 files changed, 10 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result
index 66209d2b852..c3c83947578 100644
--- a/mysql-test/r/rpl_rotate_logs.result
+++ b/mysql-test/r/rpl_rotate_logs.result
@@ -41,11 +41,16 @@ insert into t2 values(NULL);
set global sql_slave_skip_counter=1;
start slave;
purge master logs to 'master-bin.000002';
+show master logs;
+Log_name
+master-bin.000002
+master-bin.000003
+purge binary logs to 'master-bin.000002';
show binary logs;
Log_name
master-bin.000002
master-bin.000003
-purge logs before now();
+purge master logs before now();
show binary logs;
Log_name
master-bin.000003
diff --git a/mysql-test/t/rpl_rotate_logs.test b/mysql-test/t/rpl_rotate_logs.test
index 8ad5109d2c6..df506c08e71 100644
--- a/mysql-test/t/rpl_rotate_logs.test
+++ b/mysql-test/t/rpl_rotate_logs.test
@@ -90,9 +90,12 @@ connection master;
sync_slave_with_master;
connection master;
purge master logs to 'master-bin.000002';
+show master logs;
+# we just tests if synonyms are accepted
+purge binary logs to 'master-bin.000002';
show binary logs;
--sleep 1;
-purge logs before now();
+purge master logs before now();
show binary logs;
insert into t2 values (65);
sync_slave_with_master;