summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-05-27 12:01:41 +0200
committerunknown <msvensson@neptunus.(none)>2005-05-27 12:01:41 +0200
commitc31094fae9b63d559edc4129327dfba384b67d01 (patch)
tree53b11c4d9c7b3ccac2d61bdc9298cdc9f6b898ce
parent9c25429cd5891534d758ae2c4690fd00905bfc32 (diff)
downloadmariadb-git-c31094fae9b63d559edc4129327dfba384b67d01.tar.gz
Fix rpl_log and rpl_rotate_logs test result
- Remove the expected warrnings when "show binary logs" are called on zero size binary log files. mysql-test/r/rpl_log.result: Remove the warnings that is no longer displayed when "show binary logs" is called on zero size log files. Checked against 4.0, no warnings there. mysql-test/r/rpl_rotate_logs.result: Remove the warnings that is no longer displayed when "show binary logs" is called on zero size log files. Checked against 4.0, no warnings there.
-rw-r--r--mysql-test/r/rpl_log.result4
-rw-r--r--mysql-test/r/rpl_rotate_logs.result10
2 files changed, 0 insertions, 14 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index e150cf53585..5e0eec6305d 100644
--- a/mysql-test/r/rpl_log.result
+++ b/mysql-test/r/rpl_log.result
@@ -71,15 +71,11 @@ show binary logs;
Log_name File_size
master-bin.000001 0
master-bin.000002 510
-Warnings:
-Error 29 File 'master-bin.000001' not found (Errcode: 2)
start slave;
show binary logs;
Log_name File_size
slave-bin.000001 0
slave-bin.000002 348
-Warnings:
-Error 29 File 'slave-bin.000001' not found (Errcode: 2)
show binlog events in 'slave-bin.000001' from 4;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 4 Format_desc 2 98 Server ver: VERSION, Binlog ver: 4
diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result
index b9724386909..a6d3697987a 100644
--- a/mysql-test/r/rpl_rotate_logs.result
+++ b/mysql-test/r/rpl_rotate_logs.result
@@ -30,9 +30,6 @@ Log_name File_size
master-bin.000001 0
master-bin.000002 0
master-bin.000003 98
-Warnings:
-Error 29 File 'master-bin.000001' not found (Errcode: 2)
-Error 29 File 'master-bin.000002' not found (Errcode: 2)
create table t3 select * from temp_table;
select * from t3;
a
@@ -48,15 +45,11 @@ show master logs;
Log_name File_size
master-bin.000002 0
master-bin.000003 407
-Warnings:
-Error 29 File 'master-bin.000002' not found (Errcode: 2)
purge binary logs to 'master-bin.000002';
show binary logs;
Log_name File_size
master-bin.000002 0
master-bin.000003 407
-Warnings:
-Error 29 File 'master-bin.000002' not found (Errcode: 2)
purge master logs before now();
show binary logs;
Log_name File_size
@@ -84,9 +77,6 @@ Log_name File_size
master-bin.000003 0
master-bin.000004 0
master-bin.000005 2032
-Warnings:
-Error 29 File 'master-bin.000003' not found (Errcode: 2)
-Error 29 File 'master-bin.000004' not found (Errcode: 2)
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000005 2032