diff options
| author | unknown <acurtis@xiphis.org> | 2005-05-24 15:52:48 +0100 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2005-05-24 15:52:48 +0100 |
| commit | 879d932ba9b2757b21826b323cca9ae6f70e8b64 (patch) | |
| tree | 2e12d887aeb0739e493ddae71187746c1ba9ab09 /mysql-test/r/rpl_log.result | |
| parent | 0e4afc241205719296c39b0b1b0694d2baaccf21 (diff) | |
| parent | 3a23b67566681a5368fd7f7a0c1004863819dc0e (diff) | |
| download | mariadb-git-879d932ba9b2757b21826b323cca9ae6f70e8b64.tar.gz | |
Merge
mysql-test/r/lock.result:
Auto merged
mysql-test/r/rpl_log.result:
Auto merged
mysql-test/t/lock.test:
Auto merged
mysql-test/r/rpl_rotate_logs.result:
SCCS merged
sql/sql_parse.cc:
SCCS merged
sql/sql_repl.cc:
SCCS merged
Diffstat (limited to 'mysql-test/r/rpl_log.result')
| -rw-r--r-- | mysql-test/r/rpl_log.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index 5d61746b984..d32956428a5 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -68,14 +68,14 @@ master-bin.000002 260 Query 1 346 use `test`; create table t1 (n int) master-bin.000002 346 Query 1 434 use `test`; insert into t1 values (1) master-bin.000002 434 Query 1 510 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 End_log_pos Info slave-bin.000001 4 Format_desc 2 98 Server ver: VERSION, Binlog ver: 4 |