mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
62554f812e
* A more dynamic binlog format which allows small changes (1064)
* Log session variables in Query_log_event (1063)
It contains a few bugfixes (which I made when running the testsuite).
I carefully updated the results of the testsuite (i.e. I checked for every one,
if the difference between .reject and .result could be explained).
Apparently mysql-test-run --manager is broken in 4.1 and 5.0 currently,
so I could neither run the few tests which require --manager, nor check
that they pass nor modify their .result. But for builds, we don't run
with --manager.
Apart from --manager, the full testsuite passes, with Valgrind too (no errors).
I'm going to push in the next minutes. Remains: update the manual.
Note: by chance I saw that (in 4.1, in 5.0) rpl_get_lock fails when run alone;
this is normal at it makes assumptions on thread ids. I will fix this one day
in 4.1.
mysql-test/r/rpl000015.result:
result update
mysql-test/r/rpl_change_master.result:
result update
mysql-test/r/rpl_error_ignored_table.result:
result update
mysql-test/r/rpl_flush_log_loop.result:
result update
mysql-test/r/rpl_flush_tables.result:
result update
mysql-test/r/rpl_loaddata.result:
result update
mysql-test/r/rpl_loaddata_rule_m.result:
result update
mysql-test/r/rpl_loaddata_rule_s.result:
result update
mysql-test/r/rpl_log.result:
result update
mysql-test/r/rpl_log_pos.result:
result update
mysql-test/r/rpl_max_relay_size.result:
result update
mysql-test/r/rpl_relayrotate.result:
result update
mysql-test/r/rpl_replicate_do.result:
result update
mysql-test/r/rpl_reset_slave.result:
result update
mysql-test/r/rpl_rotate_logs.result:
result update
mysql-test/r/rpl_session_var.result:
result update
mysql-test/r/rpl_temporary.result:
result update
mysql-test/r/rpl_trunc_binlog.result:
result update
mysql-test/r/rpl_until.result:
result update
mysql-test/r/rpl_user_variables.result:
result update
mysql-test/t/rpl000010-slave.opt:
need to wait 2 events, because now we receive a Format_desc on top of the Rotate,
when replication starts.
mysql-test/t/rpl000015.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_change_master.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_empty_master_crash.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_error_ignored_table.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_flush_log_loop.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_loaddata.test:
position update
mysql-test/t/rpl_loaddata_rule_m.test:
position update
mysql-test/t/rpl_loaddata_rule_s.test:
position update
mysql-test/t/rpl_log.test:
position update
mysql-test/t/rpl_log_pos.test:
position update
mysql-test/t/rpl_max_relay_size.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_openssl.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_redirect.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_relayrotate-slave.opt:
better options for this test
mysql-test/t/rpl_relayrotate.test:
using max() is better for debugging (it shows at which place the slave
SQL thread resumed)
mysql-test/t/rpl_replicate_do.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_reset_slave.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_rotate_logs.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_session_var.test:
100 because password() is longer than 10 chars
mysql-test/t/rpl_trunc_binlog.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_until.test:
position update
mysql-test/t/rpl_user_variables.test:
position update
sql/log.cc:
Ensure that the Format_desc propagated on next relay logs does not trigger
undue actions (like incrementing some positions or clearing some files).
sql/log_event.cc:
* When the slave SQL thread finds a Rotate/Format_desc/Stop in the middle of
a transaction (then these were written by the slave itself to its relay log),
it should not increment rli->group* variables, but only rli->event* ones.
* When the slave SQL thread finds a Format_desc not to be ignored (not
the same server id as the slave's), if it has log_pos==0 it must not trigger
"unfinished transaction in master's binlog" (log_pos==0 is always a marker
in the relay log to mean "this event was not at this place in the master's
binlog": it's for fake Rotate events, and for Format_description events which the master had
to send us for replication to start).
* In the Query_log_event on disk, catalog is now terminated by '\0'.
* thd->catalog must be set to 0 when some exec_event() terminate (otherwise
double free).
sql/slave.cc:
* Fixes for a few bugs when ignoring events in the slave SQL thread:
- do not decrement rli->slave_skip_counter if the event is an event
related to the binlog or relay log itself (FORMAT_DESCRIPTION,
ROTATE, STOP) because these events should never be skipped (or the slave
will be confused). Usually the user wants to skip a query, not a Rotate...
- when we (re)connect to the master, we must free description_event_for_queue
(otherwise memory leak when we reconnect).
* Changed a bit the code where we change description_event_for_queue,
to make it look "safer".
* Moved 'created=0' to log.cc where it is safer.
* When the slave SQL thread finds a Rotate/Format_desc/Stop in the middle of
a transaction (then these were written by the slave itself to its relay log),
it should not increment rli->group* variables, but only rli->event* ones.
sql/sql_class.h:
a warning comment
sql/sql_repl.cc:
A mistake: I had passed a char* instead of char**
103 lines
5.3 KiB
Text
103 lines
5.3 KiB
Text
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 ignore 1 lines;
|
|
select count(*) from t1;
|
|
count(*)
|
|
69
|
|
drop table t1;
|
|
show binlog events;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 4 Format_desc 1 95 Server ver: VERSION, Binlog ver: 4
|
|
master-bin.000001 95 Query 1 210 use `test`; create table t1(n int not null auto_increment primary key)
|
|
master-bin.000001 210 Intvar 1 238 INSERT_ID=1
|
|
master-bin.000001 238 Query 1 323 use `test`; insert into t1 values (NULL)
|
|
master-bin.000001 323 Query 1 393 use `test`; drop table t1
|
|
master-bin.000001 393 Query 1 490 use `test`; create table t1 (word char(20) not null)
|
|
master-bin.000001 490 Create_file 1 1160 db=test;table=t1;file_id=1;block_len=581
|
|
master-bin.000001 1160 Exec_load 1 1183 ;file_id=1
|
|
master-bin.000001 1183 Query 1 1253 use `test`; drop table t1
|
|
show binlog events from 95 limit 1;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 95 Query 1 210 use `test`; create table t1(n int not null auto_increment primary key)
|
|
show binlog events from 95 limit 2;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 95 Query 1 210 use `test`; create table t1(n int not null auto_increment primary key)
|
|
master-bin.000001 210 Intvar 1 238 INSERT_ID=1
|
|
show binlog events from 95 limit 2,1;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 238 Query 1 323 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 End_log_pos Info
|
|
master-bin.000001 4 Format_desc 1 95 Server ver: VERSION, Binlog ver: 4
|
|
master-bin.000001 95 Query 1 210 use `test`; create table t1(n int not null auto_increment primary key)
|
|
master-bin.000001 210 Intvar 1 238 INSERT_ID=1
|
|
master-bin.000001 238 Query 1 323 use `test`; insert into t1 values (NULL)
|
|
master-bin.000001 323 Query 1 393 use `test`; drop table t1
|
|
master-bin.000001 393 Query 1 490 use `test`; create table t1 (word char(20) not null)
|
|
master-bin.000001 490 Create_file 1 1160 db=test;table=t1;file_id=1;block_len=581
|
|
master-bin.000001 1160 Exec_load 1 1183 ;file_id=1
|
|
master-bin.000001 1183 Query 1 1253 use `test`; drop table t1
|
|
master-bin.000001 1253 Rotate 1 1297 master-bin.000002;pos=4
|
|
show binlog events in 'master-bin.000002';
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000002 4 Format_desc 1 95 Server ver: VERSION, Binlog ver: 4
|
|
master-bin.000002 95 Query 1 175 use `test`; create table t5 (a int)
|
|
master-bin.000002 175 Query 1 245 use `test`; drop table t5
|
|
master-bin.000002 245 Query 1 325 use `test`; create table t1 (n int)
|
|
master-bin.000002 325 Query 1 407 use `test`; insert into t1 values (1)
|
|
master-bin.000002 407 Query 1 477 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 End_log_pos Info
|
|
slave-bin.000001 4 Format_desc 2 95 Server ver: VERSION, Binlog ver: 4
|
|
slave-bin.000001 95 Query 1 210 use `test`; create table t1(n int not null auto_increment primary key)
|
|
slave-bin.000001 210 Intvar 1 238 INSERT_ID=1
|
|
slave-bin.000001 238 Query 1 323 use `test`; insert into t1 values (NULL)
|
|
slave-bin.000001 323 Query 1 393 use `test`; drop table t1
|
|
slave-bin.000001 393 Query 1 490 use `test`; create table t1 (word char(20) not null)
|
|
slave-bin.000001 490 Create_file 1 1169 db=test;table=t1;file_id=1;block_len=581
|
|
slave-bin.000001 1169 Exec_load 1 1192 ;file_id=1
|
|
slave-bin.000001 1192 Query 1 1262 use `test`; drop table t1
|
|
slave-bin.000001 1262 Query 1 1342 use `test`; create table t5 (a int)
|
|
slave-bin.000001 1342 Query 1 1412 use `test`; drop table t5
|
|
slave-bin.000001 1412 Rotate 2 1455 slave-bin.000002;pos=4
|
|
show binlog events in 'slave-bin.000002' from 4;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
slave-bin.000002 4 Format_desc 2 95 Server ver: VERSION, Binlog ver: 4
|
|
slave-bin.000002 95 Query 1 175 use `test`; create table t1 (n int)
|
|
slave-bin.000002 175 Query 1 257 use `test`; insert into t1 values (1)
|
|
slave-bin.000002 257 Query 1 327 use `test`; drop table t1
|
|
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
|
|
# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 477 # # master-bin.000002 Yes Yes 0 0 477 # None 0 No #
|
|
show binlog events in 'slave-bin.000005' from 4;
|
|
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
|