• unknown's avatar
    Manual merge fixes · b4d59a8d
    unknown authored
    sql/lex.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/repl_failsafe.cc:
      Auto merged
    sql/share/czech/errmsg.txt:
      Auto merged
    sql/share/danish/errmsg.txt:
      Auto merged
    sql/share/dutch/errmsg.txt:
      Auto merged
    sql/share/english/errmsg.txt:
      Auto merged
    sql/share/estonian/errmsg.txt:
      Auto merged
    sql/share/french/errmsg.txt:
      Auto merged
    sql/share/german/errmsg.txt:
      Auto merged
    sql/share/greek/errmsg.txt:
      Auto merged
    sql/share/hungarian/errmsg.txt:
      Auto merged
    sql/share/italian/errmsg.txt:
      Auto merged
    sql/share/japanese/errmsg.txt:
      Auto merged
    sql/share/korean/errmsg.txt:
      Auto merged
    sql/share/norwegian-ny/errmsg.txt:
      Auto merged
    sql/share/norwegian/errmsg.txt:
      Auto merged
    sql/share/polish/errmsg.txt:
      Auto merged
    sql/share/portuguese/errmsg.txt:
      Auto merged
    sql/share/romanian/errmsg.txt:
      Auto merged
    sql/share/russian/errmsg.txt:
      Auto merged
    sql/share/slovak/errmsg.txt:
      Auto merged
    sql/share/spanish/errmsg.txt:
      Auto merged
    sql/share/swedish/errmsg.txt:
      Auto merged
    sql/share/ukrainian/errmsg.txt:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_repl.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    include/mysqld_error.h:
      Mabual merge
    mysql-test/r/rpl_flush_log_loop.result:
      Mabual merge
    mysql-test/r/rpl_log.result:
      Mabual merge
    mysql-test/r/rpl_log_pos.result:
      Mabual merge
    mysql-test/r/rpl_replicate_do.result:
      Mabual merge
    mysql-test/r/rpl_rotate_logs.result:
      Mabual merge
    sql/slave.cc:
      Mabual merge
    sql/slave.h:
      Mabual merge
    b4d59a8d
rpl_log.result 5.05 KB
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
stop slave;
reset master;
reset slave;
reset master;
create table t1(n int not null auto_increment primary key);
insert into t1 values (NULL);
drop table t1;
create table t1 (word char(20) not null);
load data infile '../../std_data/words.dat' into table t1;
drop table t1;
show binlog events;
Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
master-bin.000001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3
master-bin.000001	79	Query	1	79	use `test`; create table t1(n int not null auto_increment primary key)
master-bin.000001	172	Intvar	1	172	INSERT_ID=1
master-bin.000001	200	Query	1	200	use `test`; insert into t1 values (NULL)
master-bin.000001	263	Query	1	263	use `test`; drop table t1
master-bin.000001	311	Query	1	311	use `test`; create table t1 (word char(20) not null)
master-bin.000001	386	Create_file	1	386	db=test;table=t1;file_id=1;block_len=581
master-bin.000001	1056	Exec_load	1	1056	;file_id=1
master-bin.000001	1079	Query	1	1079	use `test`; drop table t1
show binlog events from 79 limit 1;
Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
master-bin.000001	79	Query	1	79	use `test`; create table t1(n int not null auto_increment primary key)
show binlog events from 79 limit 2;
Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
master-bin.000001	79	Query	1	79	use `test`; create table t1(n int not null auto_increment primary key)
master-bin.000001	172	Intvar	1	172	INSERT_ID=1
show binlog events from 79 limit 2,1;
Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
master-bin.000001	200	Query	1	200	use `test`; insert into t1 values (NULL)
flush logs;
create table t5 (a int);
drop table t5;
start slave;
flush logs;
stop slave;
create table t1 (n int);
insert into t1 values (1);
drop table t1;
show binlog events;
Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
master-bin.000001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3
master-bin.000001	79	Query	1	79	use `test`; create table t1(n int not null auto_increment primary key)
master-bin.000001	172	Intvar	1	172	INSERT_ID=1
master-bin.000001	200	Query	1	200	use `test`; insert into t1 values (NULL)
master-bin.000001	263	Query	1	263	use `test`; drop table t1
master-bin.000001	311	Query	1	311	use `test`; create table t1 (word char(20) not null)
master-bin.000001	386	Create_file	1	386	db=test;table=t1;file_id=1;block_len=581
master-bin.000001	1056	Exec_load	1	1056	;file_id=1
master-bin.000001	1079	Query	1	1079	use `test`; drop table t1
master-bin.000001	1127	Rotate	1	1127	master-bin.000002;pos=4
show binlog events in 'master-bin.000002';
Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
master-bin.000002	4	Query	1	4	use `test`; create table t5 (a int)
master-bin.000002	62	Query	1	62	use `test`; drop table t5
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
start slave;
show binary logs;
Log_name
slave-bin.000001
slave-bin.000002
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
slave-bin.000001	79	Query	1	79	use `test`; create table t1(n int not null auto_increment primary key)
slave-bin.000001	172	Intvar	1	172	INSERT_ID=1
slave-bin.000001	200	Query	1	200	use `test`; insert into t1 values (NULL)
slave-bin.000001	263	Query	1	263	use `test`; drop table t1
slave-bin.000001	311	Query	1	311	use `test`; create table t1 (word char(20) not null)
slave-bin.000001	386	Create_file	1	386	db=test;table=t1;file_id=1;block_len=581
slave-bin.000001	1065	Exec_load	1	1056	;file_id=1
slave-bin.000001	1088	Query	1	1079	use `test`; drop table t1
slave-bin.000001	1136	Query	1	4	use `test`; create table t5 (a int)
slave-bin.000001	1194	Query	1	62	use `test`; drop table t5
slave-bin.000001	1242	Rotate	2	1242	slave-bin.000002;pos=4
show binlog events in 'slave-bin.000002' from 4;
Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
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	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	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key
127.0.0.1	root	MASTER_PORT	1	master-bin.000002	276	slave-relay-bin.000003	214	master-bin.000002	Yes	Yes							0		0	276	214	No					
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log