summaryrefslogtreecommitdiff
path: root/mysql-test/r/rpl_log.result
diff options
context:
space:
mode:
authorunknown <guilhem@gbichot2>2003-07-23 15:46:46 +0200
committerunknown <guilhem@gbichot2>2003-07-23 15:46:46 +0200
commitdae34fb60f81802853961efad3edfa3427215680 (patch)
treeba4d0cdade886107397f37a4680254ece9f37c1c /mysql-test/r/rpl_log.result
parentcb8e29cb43e927f110b16ac959ee7afde82bf5df (diff)
downloadmariadb-git-dae34fb60f81802853961efad3edfa3427215680.tar.gz
On Feb 4th, 2003, Monty said he would push my patch to print replicate-do-table
and other replicate-*-table options in SHOW SLAVE STATUS. Seems like it had not been done, so I push it now: there's 4 new columns to SHOW SLAVE STATUS. mysql-test/r/rpl000015.result: Result update (more columns) mysql-test/r/rpl_empty_master_crash.result: Result update (more columns) mysql-test/r/rpl_flush_log_loop.result: Result update (more columns) mysql-test/r/rpl_log.result: Result update (more columns) mysql-test/r/rpl_log_pos.result: Result update (more columns) mysql-test/r/rpl_redirect.result: Result update (more columns) mysql-test/r/rpl_replicate_do.result: Result update (more columns) mysql-test/r/rpl_rotate_logs.result: Result update (more columns) mysql-test/t/rpl_replicate_do.test: Result update (more columns) sql/slave.cc: Print replicate_*_table options in SHOW SLAVE STATUS sql/slave.h: two functions to make a string of replicate_*_table lists.
Diffstat (limited to 'mysql-test/r/rpl_log.result')
-rw-r--r--mysql-test/r/rpl_log.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index df2ef4e3d8a..050e9274a99 100644
--- a/mysql-test/r/rpl_log.result
+++ b/mysql-test/r/rpl_log.result
@@ -92,7 +92,7 @@ slave-bin.000002 4 Query 1 110 use `test`; create table t1 (n int)
slave-bin.000002 62 Query 1 168 use `test`; insert into t1 values (1)
slave-bin.000002 122 Query 1 228 use `test`; drop table t1
show slave status;
-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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
-127.0.0.1 root MASTER_PORT 1 master-bin.000002 276 slave-relay-bin.000002 1531 master-bin.000002 Yes Yes 0 0 276 1535
+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
+127.0.0.1 root MASTER_PORT 1 master-bin.000002 276 slave-relay-bin.000002 1531 master-bin.000002 Yes Yes 0 0 276 1535
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log