summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <lars@mysql.com>2005-05-19 12:34:15 +0200
committerunknown <lars@mysql.com>2005-05-19 12:34:15 +0200
commite439e7c649132351c7807a15ff76917d0a6d7280 (patch)
tree2840c40a95dc9f50940bc546ec2eddc0f583c7e5 /mysql-test
parentd104149caf5d272a8495e4bd55ec9eaf3015b408 (diff)
downloadmariadb-git-e439e7c649132351c7807a15ff76917d0a6d7280.tar.gz
CSC#4944: Adding File_size to output of SHOW BINARY lOGS
mysql-test/r/rpl_log.result: Adding File_size to output of SHOW BINARY lOGS mysql-test/r/rpl_rotate_logs.result: Adding File_size to output of SHOW BINARY lOGS sql/sql_repl.cc: Adding File_size to output of SHOW BINARY lOGS
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/rpl_log.result12
-rw-r--r--mysql-test/r/rpl_rotate_logs.result30
2 files changed, 21 insertions, 21 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index 2f8a54369c9..7813d4d779d 100644
--- a/mysql-test/r/rpl_log.result
+++ b/mysql-test/r/rpl_log.result
@@ -67,14 +67,14 @@ master-bin.000002 110 Query 1 110 use `test`; create table t1 (n int)
master-bin.000002 168 Query 1 168 use `test`; insert into t1 values (1)
master-bin.000002 228 Query 1 228 use `test`; drop table t1
show binary logs;
-Log_name
-master-bin.000001
-master-bin.000002
+Log_name File_size
+master-bin.000001 0
+master-bin.000002 276
start slave;
show binary logs;
-Log_name
-slave-bin.000001
-slave-bin.000002
+Log_name File_size
+slave-bin.000001 0
+slave-bin.000002 170
show binlog events in 'slave-bin.000001' from 4;
Log_name Pos Event_type Server_id Orig_log_pos Info
slave-bin.000001 4 Start 2 4 Server ver: VERSION, Binlog ver: 3
diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result
index 62e5522fad9..66eef482a63 100644
--- a/mysql-test/r/rpl_rotate_logs.result
+++ b/mysql-test/r/rpl_rotate_logs.result
@@ -26,10 +26,10 @@ create table t2(m int not null auto_increment primary key);
insert into t2 values (34),(67),(123);
flush logs;
show binary logs;
-Log_name
-master-bin.000001
-master-bin.000002
-master-bin.000003
+Log_name File_size
+master-bin.000001 0
+master-bin.000002 0
+master-bin.000003 4
create table t3 select * from temp_table;
select * from t3;
a
@@ -42,18 +42,18 @@ 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
+Log_name File_size
+master-bin.000002 0
+master-bin.000003 229
purge binary logs to 'master-bin.000002';
show binary logs;
-Log_name
-master-bin.000002
-master-bin.000003
+Log_name File_size
+master-bin.000002 0
+master-bin.000003 229
purge master logs before now();
show binary logs;
-Log_name
-master-bin.000003
+Log_name File_size
+master-bin.000003 229
insert into t2 values (65);
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
@@ -73,9 +73,9 @@ count(*)
100
create table t4 select * from temp_table;
show binary logs;
-Log_name
-master-bin.000003
-master-bin.000004
+Log_name File_size
+master-bin.000003 0
+master-bin.000004 2886
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000004 2886