2003-01-30 18:39:54 +01:00
|
|
|
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;
|
2003-02-21 23:38:56 +01:00
|
|
|
reset master;
|
2003-01-30 18:39:54 +01:00
|
|
|
create table t1(n char(30));
|
|
|
|
set @i1:=12345678901234, @i2:=-12345678901234, @i3:=0, @i4:=-1;
|
|
|
|
set @s1:='This is a test', @r1:=12.5, @r2:=-12.5;
|
|
|
|
set @n1:=null;
|
|
|
|
set @s2:='', @s3:='abc\'def', @s4:= 'abc\\def', @s5:= 'abc''def';
|
|
|
|
insert into t1 values (@i1), (@i2), (@i3), (@i4);
|
|
|
|
insert into t1 values (@r1), (@r2);
|
|
|
|
insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5);
|
|
|
|
insert into t1 values (@n1);
|
|
|
|
insert into t1 values (@n2);
|
|
|
|
insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1);
|
|
|
|
insert into t1 values (@a+(@b:=@a+1));
|
|
|
|
set @q:='abc';
|
|
|
|
insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2'));
|
|
|
|
set @a:=5;
|
|
|
|
insert into t1 values (@a),(@a);
|
2003-10-02 10:31:37 +02:00
|
|
|
insert into t1 values (@a),(@a),(@a*5);
|
2003-01-30 18:39:54 +01:00
|
|
|
select * from t1;
|
|
|
|
n
|
|
|
|
12345678901234
|
|
|
|
-12345678901234
|
|
|
|
0
|
|
|
|
-1
|
|
|
|
12.5
|
|
|
|
-12.5
|
|
|
|
This is a test
|
|
|
|
|
|
|
|
abc'def
|
|
|
|
abc\def
|
|
|
|
abc'def
|
|
|
|
NULL
|
|
|
|
NULL
|
|
|
|
0
|
|
|
|
1
|
|
|
|
2
|
|
|
|
5
|
|
|
|
abc
|
|
|
|
abcn1
|
|
|
|
abcn1n2
|
|
|
|
5
|
|
|
|
5
|
2003-10-02 10:31:37 +02:00
|
|
|
NULL
|
|
|
|
NULL
|
|
|
|
NULL
|
|
|
|
select * from t1;
|
|
|
|
n
|
|
|
|
12345678901234
|
|
|
|
-12345678901234
|
|
|
|
0
|
|
|
|
-1
|
|
|
|
12.5
|
|
|
|
-12.5
|
|
|
|
This is a test
|
|
|
|
|
|
|
|
abc'def
|
|
|
|
abc\def
|
|
|
|
abc'def
|
|
|
|
NULL
|
|
|
|
NULL
|
|
|
|
0
|
|
|
|
1
|
|
|
|
2
|
|
|
|
5
|
|
|
|
abc
|
|
|
|
abcn1
|
|
|
|
abcn1n2
|
|
|
|
5
|
|
|
|
5
|
|
|
|
NULL
|
|
|
|
NULL
|
|
|
|
NULL
|
This is the final commit for Worklog tasks:
* 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**
2003-12-19 22:40:23 +01:00
|
|
|
show binlog events from 179;
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
slave-bin.000001 179 User var 2 222 @i1=12345678901234
|
|
|
|
slave-bin.000001 222 User var 2 265 @i2=-12345678901234
|
|
|
|
slave-bin.000001 265 User var 2 308 @i3=0
|
|
|
|
slave-bin.000001 308 User var 2 351 @i4=-1
|
|
|
|
slave-bin.000001 351 Query 1 456 use `test`; insert into t1 values (@i1), (@i2), (@i3), (@i4)
|
|
|
|
slave-bin.000001 456 User var 2 499 @r1=12.5
|
|
|
|
slave-bin.000001 499 User var 2 542 @r2=-12.5
|
|
|
|
slave-bin.000001 542 Query 1 633 use `test`; insert into t1 values (@r1), (@r2)
|
|
|
|
slave-bin.000001 633 User var 2 682 @s1='This is a test'
|
|
|
|
slave-bin.000001 682 User var 2 717 @s2=''
|
|
|
|
slave-bin.000001 717 User var 2 759 @s3='abc'def'
|
|
|
|
slave-bin.000001 759 User var 2 801 @s4='abc\def'
|
|
|
|
slave-bin.000001 801 User var 2 843 @s5='abc'def'
|
|
|
|
slave-bin.000001 843 Query 1 955 use `test`; insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5)
|
|
|
|
slave-bin.000001 955 User var 2 981 @n1=NULL
|
|
|
|
slave-bin.000001 981 Query 1 1065 use `test`; insert into t1 values (@n1)
|
|
|
|
slave-bin.000001 1065 User var 2 1091 @n2=NULL
|
|
|
|
slave-bin.000001 1091 Query 1 1175 use `test`; insert into t1 values (@n2)
|
|
|
|
slave-bin.000001 1175 Query 1 1285 use `test`; insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1)
|
|
|
|
slave-bin.000001 1285 User var 2 1327 @a=2
|
|
|
|
slave-bin.000001 1327 Query 1 1421 use `test`; insert into t1 values (@a+(@b:=@a+1))
|
|
|
|
slave-bin.000001 1421 User var 2 1458 @q='abc'
|
|
|
|
slave-bin.000001 1458 Query 1 1584 use `test`; insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2'))
|
|
|
|
slave-bin.000001 1584 User var 2 1626 @a=5
|
|
|
|
slave-bin.000001 1626 Query 1 1714 use `test`; insert into t1 values (@a),(@a)
|
|
|
|
slave-bin.000001 1714 User var 2 1739 @a=NULL
|
|
|
|
slave-bin.000001 1739 Query 1 1834 use `test`; insert into t1 values (@a),(@a),(@a*5)
|
2003-01-30 18:39:54 +01:00
|
|
|
drop table t1;
|
|
|
|
stop slave;
|