Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1800 05/04/08 11:40:49 mats@stripped +29 -0
WL#1012: binary log position changed.
mysql-test/r/user_var.result
1.31 05/04/08 11:40:42 mats@stripped +1 -1
Binary log position changed.
mysql-test/r/rpl_user_variables.result
1.17 05/04/08 11:40:42 mats@stripped +1 -1
Binary log position changed.
mysql-test/r/rpl_until.result
1.23 05/04/08 11:40:42 mats@stripped +19 -19
Binary log position changed.
mysql-test/r/rpl_server_id2.result
1.11 05/04/08 11:40:42 mats@stripped +1 -1
Binary log position changed.
mysql-test/r/rpl_server_id1.result
1.10 05/04/08 11:40:42 mats@stripped +1 -1
Binary log position changed.
mysql-test/r/rpl_rotate_logs.result
1.69 05/04/08 11:40:42 mats@stripped +4 -4
Binary log position changed.
mysql-test/r/rpl_reset_slave.result
1.16 05/04/08 11:40:42 mats@stripped +3 -3
Binary log position changed.
mysql-test/r/rpl_replicate_do.result
1.31 05/04/08 11:40:42 mats@stripped +1 -1
Binary log position changed.
mysql-test/r/rpl_relayrotate.result
1.19 05/04/08 11:40:42 mats@stripped +1 -1
Binary log position changed.
mysql-test/r/rpl_multi_query.result
1.6 05/04/08 11:40:42 mats@stripped +1 -1
Binary log position changed.
mysql-test/r/rpl_max_relay_size.result
1.22 05/04/08 11:40:42 mats@stripped +6 -6
Binary log position changed.
mysql-test/r/rpl_log_pos.result
1.45 05/04/08 11:40:42 mats@stripped +10 -10
Binary log position changed.
mysql-test/r/rpl_log.result
1.59 05/04/08 11:40:41 mats@stripped +51 -51
Binary log position changed.
mysql-test/r/rpl_loaddata_rule_s.result
1.10 05/04/08 11:40:41 mats@stripped +1 -1
Binary log position changed.
mysql-test/r/rpl_loaddata_rule_m.result
1.16 05/04/08 11:40:41 mats@stripped +1 -1
Binary log position changed.
mysql-test/r/rpl_loaddata.result
1.30 05/04/08 11:40:41 mats@stripped +4 -4
Binary log position changed.
mysql-test/r/rpl_flush_log_loop.result
1.25 05/04/08 11:40:41 mats@stripped +1 -1
Binary log position changed.
mysql-test/r/rpl_error_ignored_table.result
1.22 05/04/08 11:40:41 mats@stripped +2 -2
Binary log position changed.
mysql-test/r/rpl_deadlock.result
1.5 05/04/08 11:40:41 mats@stripped +5 -5
Binary log position changed.
mysql-test/r/rpl_charset.result
1.21 05/04/08 11:40:41 mats@stripped +1 -1
Binary log position changed.
mysql-test/r/rpl_change_master.result
1.19 05/04/08 11:40:41 mats@stripped +2 -2
Binary log position changed.
mysql-test/r/rpl000015.result
1.37 05/04/08 11:40:41 mats@stripped +2 -2
Binary log position changed.
mysql-test/r/mix_innodb_myisam_binlog.result
1.23 05/04/08 11:40:41 mats@stripped +62 -62
Binary log position changed.
mysql-test/r/ctype_ucs.result
1.34 05/04/08 11:40:41 mats@stripped +1 -1
Binary log position changed.
mysql-test/r/binlog.result
1.5 05/04/08 11:40:41 mats@stripped +3 -3
Binary log position changed.
mysql-test/r/rpl_row_basic_myisam.result
1.4 05/04/04 16:29:34 mats@stripped +0 -0
Rename: mysql-test/r/rpl_row_basic.result -> mysql-test/r/rpl_row_basic_myisam.result
mysql-test/t/rpl_row_basic_myisam-slave.opt
1.2 05/04/04 16:29:09 mats@stripped +0 -0
Rename: mysql-test/t/rpl_row_basic-slave.opt -> mysql-test/t/rpl_row_basic_myisam-slave.opt
mysql-test/t/rpl_row_basic_myisam-master.opt
1.2 05/04/04 16:28:52 mats@stripped +0 -0
Rename: mysql-test/t/rpl_row_basic-master.opt -> mysql-test/t/rpl_row_basic_myisam-master.opt
mysql-test/t/rpl_row_basic_myisam.test
1.4 05/04/04 16:28:35 mats@stripped +0 -0
Rename: mysql-test/t/rpl_row_basic.test -> mysql-test/t/rpl_row_basic_myisam.test
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: mats
# Host: romeo.kindahl.net
# Root: /home/bk/w1012-mysql-5.1
--- 1.33/mysql-test/r/ctype_ucs.result 2005-03-22 09:32:43 +01:00
+++ 1.34/mysql-test/r/ctype_ucs.result 2005-04-08 11:40:41 +02:00
@@ -523,7 +523,7 @@
set @v=convert('abc' using ucs2);
reset master;
insert into t2 values (@v);
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # User var 1 # @`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci
master-bin.000001 # Query 1 # use `test`; insert into t2 values (@v)
--- 1.22/mysql-test/r/rpl_until.result 2005-03-22 09:32:43 +01:00
+++ 1.23/mysql-test/r/rpl_until.result 2005-04-08 11:40:42 +02:00
@@ -14,15 +14,15 @@
drop table t2;
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 98 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 98 Query 1 220 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 220 Query 1 321 use `test`; insert into t1 values (1),(2),(3),(4)
-master-bin.000001 321 Query 1 398 use `test`; drop table t1
-master-bin.000001 398 Query 1 520 use `test`; create table t2(n int not null auto_increment primary key)
-master-bin.000001 520 Query 1 613 use `test`; insert into t2 values (1),(2)
-master-bin.000001 613 Query 1 706 use `test`; insert into t2 values (3),(4)
-master-bin.000001 706 Query 1 783 use `test`; drop table t2
-start slave until master_log_file='master-bin.000001', master_log_pos=321;
+master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
+master-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 224 Query 1 325 use `test`; insert into t1 values (1),(2),(3),(4)
+master-bin.000001 325 Query 1 402 use `test`; drop table t1
+master-bin.000001 402 Query 1 524 use `test`; create table t2(n int not null auto_increment primary key)
+master-bin.000001 524 Query 1 617 use `test`; insert into t2 values (1),(2)
+master-bin.000001 617 Query 1 710 use `test`; insert into t2 values (3),(4)
+master-bin.000001 710 Query 1 787 use `test`; drop table t2
+start slave until master_log_file='master-bin.000001', master_log_pos=325;
select * from t1;
n
1
@@ -31,8 +31,8 @@
4
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_MYPORT 1 master-bin.000001 783 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 321 # Master master-bin.000001 321 No #
-start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 325 # Master master-bin.000001 325 No #
+start slave until master_log_file='master-no-such-bin.000001', master_log_pos=295;
select * from t1;
n
1
@@ -41,7 +41,7 @@
4
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_MYPORT 1 master-bin.000001 783 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 321 # Master master-no-such-bin.000001 291 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 325 # Master master-no-such-bin.000001 295 No #
start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=751;
select * from t2;
n
@@ -49,24 +49,24 @@
2
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_MYPORT 1 master-bin.000001 783 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 613 # Relay slave-relay-bin.000004 751 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 617 # Relay slave-relay-bin.000004 751 No #
start slave;
stop slave;
-start slave until master_log_file='master-bin.000001', master_log_pos=783;
+start slave until master_log_file='master-bin.000001', master_log_pos=787;
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_MYPORT 1 master-bin.000001 783 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 783 # Master master-bin.000001 783 No #
-start slave until master_log_file='master-bin', master_log_pos=561;
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 787 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 787 # Master master-bin.000001 787 No #
+start slave until master_log_file='master-bin', master_log_pos=565;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
-start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12;
+start slave until master_log_file='master-bin.000001', master_log_pos=565, relay_log_pos=16;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
start slave until master_log_file='master-bin.000001';
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
start slave until relay_log_file='slave-relay-bin.000002';
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
-start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561;
+start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=565;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
start slave sql_thread;
-start slave until master_log_file='master-bin.000001', master_log_pos=783;
+start slave until master_log_file='master-bin.000001', master_log_pos=787;
Warnings:
Note 1254 Slave is already running
--- 1.16/mysql-test/r/rpl_user_variables.result 2005-03-22 09:32:43 +01:00
+++ 1.17/mysql-test/r/rpl_user_variables.result 2005-04-08 11:40:42 +02:00
@@ -76,7 +76,7 @@
NULL
NULL
NULL
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Query 1 # use `test`; create table t1(n char(30))
slave-bin.000001 # User var 2 # @`i1`=12345678901234
--- 1.22/mysql-test/r/mix_innodb_myisam_binlog.result 2005-03-22 09:32:43 +01:00
+++ 1.23/mysql-test/r/mix_innodb_myisam_binlog.result 2005-04-08 11:40:41 +02:00
@@ -6,12 +6,12 @@
insert into t1 values(1);
insert into t2 select * from t1;
commit;
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 98 Query 1 # use `test`; BEGIN
-master-bin.000001 167 Query 1 # use `test`; insert into t1 values(1)
-master-bin.000001 255 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 350 Xid 1 # COMMIT /* xid=7 */
+master-bin.000001 102 Query 1 # use `test`; BEGIN
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(1)
+master-bin.000001 259 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 354 Xid 1 # COMMIT /* xid=7 */
delete from t1;
delete from t2;
reset master;
@@ -21,12 +21,12 @@
rollback;
Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 98 Query 1 # use `test`; BEGIN
-master-bin.000001 167 Query 1 # use `test`; insert into t1 values(2)
-master-bin.000001 255 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 350 Query 1 # use `test`; ROLLBACK
+master-bin.000001 102 Query 1 # use `test`; BEGIN
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(2)
+master-bin.000001 259 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 354 Query 1 # use `test`; ROLLBACK
delete from t1;
delete from t2;
reset master;
@@ -39,15 +39,15 @@
Warnings:
Warning 1196 Some non-transactional changed tables couldn't be rolled back
commit;
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 98 Query 1 # use `test`; BEGIN
-master-bin.000001 167 Query 1 # use `test`; insert into t1 values(3)
-master-bin.000001 255 Query 1 # use `test`; savepoint my_savepoint
-master-bin.000001 341 Query 1 # use `test`; insert into t1 values(4)
-master-bin.000001 429 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 524 Query 1 # use `test`; rollback to savepoint my_savepoint
-master-bin.000001 622 Xid 1 # COMMIT /* xid=24 */
+master-bin.000001 102 Query 1 # use `test`; BEGIN
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(3)
+master-bin.000001 259 Query 1 # use `test`; savepoint my_savepoint
+master-bin.000001 345 Query 1 # use `test`; insert into t1 values(4)
+master-bin.000001 433 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 528 Query 1 # use `test`; rollback to savepoint my_savepoint
+master-bin.000001 626 Xid 1 # COMMIT /* xid=24 */
delete from t1;
delete from t2;
reset master;
@@ -65,16 +65,16 @@
a
5
7
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 98 Query 1 # use `test`; BEGIN
-master-bin.000001 167 Query 1 # use `test`; insert into t1 values(5)
-master-bin.000001 255 Query 1 # use `test`; savepoint my_savepoint
-master-bin.000001 341 Query 1 # use `test`; insert into t1 values(6)
-master-bin.000001 429 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 524 Query 1 # use `test`; rollback to savepoint my_savepoint
-master-bin.000001 622 Query 1 # use `test`; insert into t1 values(7)
-master-bin.000001 710 Xid 1 # COMMIT /* xid=36 */
+master-bin.000001 102 Query 1 # use `test`; BEGIN
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(5)
+master-bin.000001 259 Query 1 # use `test`; savepoint my_savepoint
+master-bin.000001 345 Query 1 # use `test`; insert into t1 values(6)
+master-bin.000001 433 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 528 Query 1 # use `test`; rollback to savepoint my_savepoint
+master-bin.000001 626 Query 1 # use `test`; insert into t1 values(7)
+master-bin.000001 714 Xid 1 # COMMIT /* xid=36 */
delete from t1;
delete from t2;
reset master;
@@ -87,43 +87,43 @@
select get_lock("a",10);
get_lock("a",10)
1
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 98 Query 1 # use `test`; BEGIN
-master-bin.000001 167 Query 1 # use `test`; insert into t1 values(8)
-master-bin.000001 255 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 350 Query 1 # use `test`; ROLLBACK
+master-bin.000001 102 Query 1 # use `test`; BEGIN
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(8)
+master-bin.000001 259 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 354 Query 1 # use `test`; ROLLBACK
delete from t1;
delete from t2;
reset master;
insert into t1 values(9);
insert into t2 select * from t1;
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 98 Query 1 # use `test`; insert into t1 values(9)
-master-bin.000001 186 Xid 1 # COMMIT /* xid=59 */
-master-bin.000001 213 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 102 Query 1 # use `test`; insert into t1 values(9)
+master-bin.000001 190 Xid 1 # COMMIT /* xid=59 */
+master-bin.000001 217 Query 1 # use `test`; insert into t2 select * from t1
delete from t1;
delete from t2;
reset master;
insert into t1 values(10);
begin;
insert into t2 select * from t1;
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 98 Query 1 # use `test`; insert into t1 values(10)
-master-bin.000001 187 Xid 1 # COMMIT /* xid=65 */
-master-bin.000001 214 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 102 Query 1 # use `test`; insert into t1 values(10)
+master-bin.000001 191 Xid 1 # COMMIT /* xid=65 */
+master-bin.000001 218 Query 1 # use `test`; insert into t2 select * from t1
insert into t1 values(11);
commit;
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 98 Query 1 # use `test`; insert into t1 values(10)
-master-bin.000001 187 Xid 1 # COMMIT /* xid=65 */
-master-bin.000001 214 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 309 Query 1 # use `test`; BEGIN
-master-bin.000001 378 Query 1 # use `test`; insert into t1 values(11)
-master-bin.000001 467 Xid 1 # COMMIT /* xid=67 */
+master-bin.000001 102 Query 1 # use `test`; insert into t1 values(10)
+master-bin.000001 191 Xid 1 # COMMIT /* xid=65 */
+master-bin.000001 218 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 313 Query 1 # use `test`; BEGIN
+master-bin.000001 382 Query 1 # use `test`; insert into t1 values(11)
+master-bin.000001 471 Xid 1 # COMMIT /* xid=67 */
alter table t2 engine=INNODB;
delete from t1;
delete from t2;
@@ -132,12 +132,12 @@
insert into t1 values(12);
insert into t2 select * from t1;
commit;
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 98 Query 1 # use `test`; BEGIN
-master-bin.000001 167 Query 1 # use `test`; insert into t1 values(12)
-master-bin.000001 256 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 351 Xid 1 # COMMIT /* xid=77 */
+master-bin.000001 102 Query 1 # use `test`; BEGIN
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(12)
+master-bin.000001 260 Query 1 # use `test`; insert into t2 select * from t1
+master-bin.000001 355 Xid 1 # COMMIT /* xid=77 */
delete from t1;
delete from t2;
reset master;
@@ -145,7 +145,7 @@
insert into t1 values(13);
insert into t2 select * from t1;
rollback;
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
delete from t1;
delete from t2;
@@ -157,11 +157,11 @@
insert into t2 select * from t1;
rollback to savepoint my_savepoint;
commit;
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 98 Query 1 # use `test`; BEGIN
-master-bin.000001 167 Query 1 # use `test`; insert into t1 values(14)
-master-bin.000001 256 Xid 1 # COMMIT /* xid=93 */
+master-bin.000001 102 Query 1 # use `test`; BEGIN
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(14)
+master-bin.000001 260 Xid 1 # COMMIT /* xid=93 */
delete from t1;
delete from t2;
reset master;
@@ -177,12 +177,12 @@
a
16
18
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 98 Query 1 # use `test`; BEGIN
-master-bin.000001 167 Query 1 # use `test`; insert into t1 values(16)
-master-bin.000001 256 Query 1 # use `test`; insert into t1 values(18)
-master-bin.000001 345 Xid 1 # COMMIT /* xid=104 */
+master-bin.000001 102 Query 1 # use `test`; BEGIN
+master-bin.000001 171 Query 1 # use `test`; insert into t1 values(16)
+master-bin.000001 260 Query 1 # use `test`; insert into t1 values(18)
+master-bin.000001 349 Xid 1 # COMMIT /* xid=104 */
delete from t1;
delete from t2;
alter table t2 type=MyISAM;
--- 1.18/mysql-test/r/rpl_change_master.result 2005-03-22 09:32:43 +01:00
+++ 1.19/mysql-test/r/rpl_change_master.result 2005-04-08 11:40:41 +02:00
@@ -13,11 +13,11 @@
stop slave;
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_MYPORT 1 master-bin.000001 360 # # master-bin.000001 No No 0 0 184 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 364 # # master-bin.000001 No No 0 0 188 # None 0 No #
change master to master_user='root';
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_MYPORT 1 master-bin.000001 184 # # master-bin.000001 No No 0 0 184 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 188 # # master-bin.000001 No No 0 0 188 # None 0 No #
start slave;
select * from t1;
n
--- 1.20/mysql-test/r/rpl_charset.result 2005-03-22 09:32:43 +01:00
+++ 1.21/mysql-test/r/rpl_charset.result 2005-04-08 11:40:41 +02:00
@@ -103,7 +103,7 @@
1 cp850_general_ci
drop database mysqltest2;
drop database mysqltest3;
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # drop database if exists mysqltest2
master-bin.000001 # Query 1 # drop database if exists mysqltest3
--- 1.4/mysql-test/r/rpl_deadlock.result 2005-03-22 09:32:43 +01:00
+++ 1.5/mysql-test/r/rpl_deadlock.result 2005-04-08 11:40:41 +02:00
@@ -39,9 +39,9 @@
22
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_MYPORT 1 master-bin.000001 19118 # # master-bin.000001 Yes Yes 0 0 19118 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 19122 # # master-bin.000001 Yes Yes 0 0 19122 # None 0 No #
stop slave;
-change master to master_log_pos=536;
+change master to master_log_pos=540;
begin;
select * from t2 for update;
a
@@ -57,10 +57,10 @@
22
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_MYPORT 1 master-bin.000001 19118 # # master-bin.000001 Yes Yes 0 0 19118 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 19122 # # master-bin.000001 Yes Yes 0 0 19122 # None 0 No #
set global max_relay_log_size=0;
stop slave;
-change master to master_log_pos=536;
+change master to master_log_pos=540;
begin;
select * from t2 for update;
a
@@ -77,5 +77,5 @@
22
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_MYPORT 1 master-bin.000001 19118 # # master-bin.000001 Yes Yes 0 0 19118 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 19122 # # master-bin.000001 Yes Yes 0 0 19122 # None 0 No #
drop table t1,t2;
--- 1.21/mysql-test/r/rpl_error_ignored_table.result 2005-03-22 09:32:43 +01:00
+++ 1.22/mysql-test/r/rpl_error_ignored_table.result 2005-04-08 11:40:41 +02:00
@@ -9,7 +9,7 @@
ERROR 23000: Duplicate entry '1' for key 1
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.000001 290 # # master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 290 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 294 # # master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 294 # None 0 No #
show tables like 't1';
Tables_in_test (t1)
drop table t1;
@@ -26,7 +26,7 @@
0
kill @id;
drop table t2,t3;
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # use `test`; create table t1 (a int primary key)
master-bin.000001 # Query 1 # use `test`; insert into t1 values (1),(1)
--- 1.15/mysql-test/r/rpl_loaddata_rule_m.result 2005-03-22 09:32:43 +01:00
+++ 1.16/mysql-test/r/rpl_loaddata_rule_m.result 2005-04-08 11:40:41 +02:00
@@ -10,7 +10,7 @@
create table t1(a int, b int, unique(b));
use mysqltest;
load data infile '../../std_data/rpl_loaddata.dat' into table test.t1;
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # drop database if exists mysqltest
master-bin.000001 # Query 1 # create database mysqltest
--- 1.9/mysql-test/r/rpl_loaddata_rule_s.result 2005-03-22 09:32:43 +01:00
+++ 1.10/mysql-test/r/rpl_loaddata_rule_s.result 2005-04-08 11:40:41 +02:00
@@ -10,5 +10,5 @@
select count(*) from t1;
count(*)
2
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
--- 1.21/mysql-test/r/rpl_max_relay_size.result 2005-03-22 09:32:43 +01:00
+++ 1.22/mysql-test/r/rpl_max_relay_size.result 2005-04-08 11:40:42 +02:00
@@ -16,7 +16,7 @@
start slave;
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.000001 73754 # # master-bin.000001 Yes Yes 0 0 73754 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73758 # # master-bin.000001 Yes Yes 0 0 73758 # None 0 No #
stop slave;
reset slave;
set global max_relay_log_size=(5*4096);
@@ -26,7 +26,7 @@
start slave;
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.000001 73754 # # master-bin.000001 Yes Yes 0 0 73754 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73758 # # master-bin.000001 Yes Yes 0 0 73758 # None 0 No #
stop slave;
reset slave;
set global max_relay_log_size=0;
@@ -36,7 +36,7 @@
start slave;
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.000001 73754 # # master-bin.000001 Yes Yes 0 0 73754 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73758 # # master-bin.000001 Yes Yes 0 0 73758 # None 0 No #
stop slave;
reset slave;
flush logs;
@@ -49,13 +49,13 @@
create table t1 (a int);
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.000001 73841 # # master-bin.000001 Yes Yes 0 0 73841 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73845 # # master-bin.000001 Yes Yes 0 0 73845 # None 0 No #
flush logs;
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.000001 73918 # # master-bin.000001 Yes Yes 0 0 73918 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73922 # # master-bin.000001 Yes Yes 0 0 73922 # None 0 No #
flush logs;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000002 98
+master-bin.000002 102
--- 1.5/mysql-test/r/rpl_multi_query.result 2005-03-22 09:32:43 +01:00
+++ 1.6/mysql-test/r/rpl_multi_query.result 2005-04-08 11:40:42 +02:00
@@ -19,7 +19,7 @@
3
4
5
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # drop database if exists mysqltest
master-bin.000001 # Query 1 # create database mysqltest
--- 1.18/mysql-test/r/rpl_relayrotate.result 2005-03-22 09:32:43 +01:00
+++ 1.19/mysql-test/r/rpl_relayrotate.result 2005-04-08 11:40:42 +02:00
@@ -18,5 +18,5 @@
8000
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_MYPORT 1 master-bin.000001 743188 # # master-bin.000001 Yes Yes 0 0 743188 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 743192 # # master-bin.000001 Yes Yes 0 0 743192 # None 0 No #
drop table t1;
--- 1.15/mysql-test/r/rpl_reset_slave.result 2005-03-22 09:32:43 +01:00
+++ 1.16/mysql-test/r/rpl_reset_slave.result 2005-04-08 11:40:42 +02:00
@@ -6,12 +6,12 @@
start slave;
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.000001 98 # # master-bin.000001 Yes Yes 0 0 98 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 102 # # master-bin.000001 Yes Yes 0 0 102 # None 0 No #
stop slave;
change master to master_user='test';
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 test MASTER_PORT 1 master-bin.000001 98 # # master-bin.000001 No No 0 0 98 # None 0 No #
+# 127.0.0.1 test MASTER_PORT 1 master-bin.000001 102 # # master-bin.000001 No No 0 0 102 # None 0 No #
reset slave;
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
@@ -19,7 +19,7 @@
start slave;
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.000001 98 # # master-bin.000001 Yes Yes 0 0 98 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 102 # # master-bin.000001 Yes Yes 0 0 102 # None 0 No #
stop slave;
reset slave;
start slave;
--- 1.9/mysql-test/r/rpl_server_id1.result 2005-03-22 09:32:43 +01:00
+++ 1.10/mysql-test/r/rpl_server_id1.result 2005-04-08 11:40:42 +02:00
@@ -10,7 +10,7 @@
change master to master_port=SLAVE_PORT;
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 SLAVE_PORT 1 4 slave-relay-bin.000001 4 No No # 0 0 0 98 None 0 No NULL
+ 127.0.0.1 root SLAVE_PORT 1 4 slave-relay-bin.000001 4 No No # 0 0 0 102 None 0 No NULL
start slave;
insert into t1 values (1);
show status like "slave_running";
--- 1.10/mysql-test/r/rpl_server_id2.result 2005-03-22 09:32:43 +01:00
+++ 1.11/mysql-test/r/rpl_server_id2.result 2005-04-08 11:40:42 +02:00
@@ -10,7 +10,7 @@
change master to master_port=SLAVE_PORT;
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 SLAVE_PORT 1 4 slave-relay-bin.000001 4 No No # 0 0 0 98 None 0 No NULL
+ 127.0.0.1 root SLAVE_PORT 1 4 slave-relay-bin.000001 4 No No # 0 0 0 102 None 0 No NULL
start slave;
insert into t1 values (1);
select * from t1;
--- 1.24/mysql-test/r/rpl_flush_log_loop.result 2005-03-22 09:32:43 +01:00
+++ 1.25/mysql-test/r/rpl_flush_log_loop.result 2005-04-08 11:40:41 +02:00
@@ -14,4 +14,4 @@
flush logs;
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 SLAVE_PORT 60 slave-bin.000001 209 # # slave-bin.000001 Yes Yes 0 0 209 # None 0 No #
+# 127.0.0.1 root SLAVE_PORT 60 slave-bin.000001 213 # # slave-bin.000001 Yes Yes 0 0 213 # None 0 No #
--- 1.29/mysql-test/r/rpl_loaddata.result 2005-03-22 09:32:43 +01:00
+++ 1.30/mysql-test/r/rpl_loaddata.result 2005-04-08 11:40:41 +02:00
@@ -22,7 +22,7 @@
2003-03-22 2416 a bbbbb
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-slave-bin.000001 1292
+slave-bin.000001 1296
drop table t1;
drop table t2;
drop table t3;
@@ -33,7 +33,7 @@
start slave;
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.000001 1800 # # master-bin.000001 Yes Yes 0 0 1800 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1804 # # master-bin.000001 Yes Yes 0 0 1804 # None 0 No #
set sql_log_bin=0;
delete from t1;
set sql_log_bin=1;
@@ -43,7 +43,7 @@
change master to master_user='root';
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.000001 1835 # # master-bin.000001 No No 0 0 1835 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1839 # # master-bin.000001 No No 0 0 1839 # None 0 No #
set global sql_slave_skip_counter=1;
start slave;
set sql_log_bin=0;
@@ -64,5 +64,5 @@
ERROR 23000: Duplicate entry '2003-03-22' for key 1
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 441
+master-bin.000001 445
drop table t2;
--- 1.30/mysql-test/r/rpl_replicate_do.result 2005-03-22 09:32:43 +01:00
+++ 1.31/mysql-test/r/rpl_replicate_do.result 2005-04-08 11:40:42 +02:00
@@ -28,4 +28,4 @@
drop table if exists t1,t2,t11;
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.000001 1668 # # master-bin.000001 Yes Yes test.t1 0 0 1668 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1672 # # master-bin.000001 Yes Yes test.t1 0 0 1672 # None 0 No #
--- 1.44/mysql-test/r/rpl_log_pos.result 2005-03-22 09:32:43 +01:00
+++ 1.45/mysql-test/r/rpl_log_pos.result 2005-04-08 11:40:42 +02:00
@@ -6,37 +6,37 @@
start slave;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 98
+master-bin.000001 102
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.000001 98 # # master-bin.000001 Yes Yes 0 0 98 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 102 # # master-bin.000001 Yes Yes 0 0 102 # None 0 No #
stop slave;
-change master to master_log_pos=73;
+change master to master_log_pos=74;
start slave;
stop slave;
-change master to master_log_pos=73;
+change master to master_log_pos=74;
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.000001 73 # # master-bin.000001 No No 0 0 73 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 74 # # master-bin.000001 No No 0 0 74 # None 0 No #
start slave;
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.000001 73 # # master-bin.000001 No Yes 0 0 73 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 74 # # master-bin.000001 No Yes 0 0 74 # None 0 No #
stop slave;
-change master to master_log_pos=173;
+change master to master_log_pos=177;
start slave;
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.000001 173 # # master-bin.000001 No Yes 0 0 173 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 177 # # master-bin.000001 No Yes 0 0 177 # None 0 No #
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 98
+master-bin.000001 102
create table if not exists t1 (n int);
drop table if exists t1;
create table t1 (n int);
insert into t1 values (1),(2),(3);
stop slave;
-change master to master_log_pos=98;
+change master to master_log_pos=102;
start slave;
select * from t1;
n
--- 1.36/mysql-test/r/rpl000015.result 2005-03-22 09:32:43 +01:00
+++ 1.37/mysql-test/r/rpl000015.result 2005-04-08 11:40:41 +02:00
@@ -1,7 +1,7 @@
reset master;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 98
+master-bin.000001 102
reset slave;
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
@@ -17,7 +17,7 @@
start slave;
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 7 master-bin.000001 98 # # master-bin.000001 Yes Yes 0 0 98 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 7 master-bin.000001 102 # # master-bin.000001 Yes Yes 0 0 102 # None 0 No #
drop table if exists t1;
create table t1 (n int);
insert into t1 values (10),(45),(90);
--- 1.68/mysql-test/r/rpl_rotate_logs.result 2005-03-22 09:32:43 +01:00
+++ 1.69/mysql-test/r/rpl_rotate_logs.result 2005-04-08 11:40:42 +02:00
@@ -16,7 +16,7 @@
insert into t1 values('Could not break slave'),('Tried hard');
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 60 master-bin.000001 552 # # master-bin.000001 Yes Yes 0 0 552 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 60 master-bin.000001 556 # # master-bin.000001 Yes Yes 0 0 556 # None 0 No #
select * from t1;
s
Could not break slave
@@ -57,7 +57,7 @@
insert into t2 values (65);
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 60 master-bin.000003 500 # # master-bin.000003 Yes Yes 0 0 500 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 60 master-bin.000003 504 # # master-bin.000003 Yes Yes 0 0 504 # None 0 No #
select * from t2;
m
34
@@ -79,13 +79,13 @@
master-bin.000005
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000005 2146
+master-bin.000005 2150
select * from t4;
a
testing temporary tables part 2
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 60 master-bin.000005 2146 # # master-bin.000005 Yes Yes 0 0 2146 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 60 master-bin.000005 2150 # # master-bin.000005 Yes Yes 0 0 2150 # None 0 No #
lock tables t3 read;
select count(*) from t3 where n >= 4;
count(*)
--- 1.58/mysql-test/r/rpl_log.result 2005-03-22 09:32:43 +01:00
+++ 1.59/mysql-test/r/rpl_log.result 2005-04-08 11:40:41 +02:00
@@ -19,25 +19,25 @@
drop table t1;
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 98 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 98 Query 1 220 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 220 Intvar 1 248 INSERT_ID=1
-master-bin.000001 248 Query 1 340 use `test`; insert into t1 values (NULL)
-master-bin.000001 340 Query 1 417 use `test`; drop table t1
-master-bin.000001 417 Query 1 521 use `test`; create table t1 (word char(20) not null)
-master-bin.000001 521 Begin_load_query 1 1125 ;file_id=1;block_len=581
-master-bin.000001 1125 Execute_load_query 1 1274 use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
-master-bin.000001 1274 Query 1 1351 use `test`; drop table t1
-show binlog events from 98 limit 1;
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 98 Query 1 220 use `test`; create table t1(n int not null auto_increment primary key)
-show binlog events from 98 limit 2;
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 98 Query 1 220 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 220 Intvar 1 248 INSERT_ID=1
-show binlog events from 98 limit 2,1;
+master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
+master-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 224 Intvar 1 252 INSERT_ID=1
+master-bin.000001 252 Query 1 344 use `test`; insert into t1 values (NULL)
+master-bin.000001 344 Query 1 421 use `test`; drop table t1
+master-bin.000001 421 Query 1 525 use `test`; create table t1 (word char(20) not null)
+master-bin.000001 525 Begin_load_query 1 1129 ;file_id=1;block_len=581
+master-bin.000001 1129 Execute_load_query 1 1278 use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
+master-bin.000001 1278 Query 1 1355 use `test`; drop table t1
+show binlog events from 102 limit 1;
+Log_name Pos Event_type Server_id End_log_pos Info
+master-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
+show binlog events from 102 limit 2;
+Log_name Pos Event_type Server_id End_log_pos Info
+master-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 224 Intvar 1 252 INSERT_ID=1
+show binlog events from 102 limit 2,1;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 248 Query 1 340 use `test`; insert into t1 values (NULL)
+master-bin.000001 252 Query 1 344 use `test`; insert into t1 values (NULL)
flush logs;
create table t5 (a int);
drop table t5;
@@ -49,24 +49,24 @@
drop table t1;
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 98 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 98 Query 1 220 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 220 Intvar 1 248 INSERT_ID=1
-master-bin.000001 248 Query 1 340 use `test`; insert into t1 values (NULL)
-master-bin.000001 340 Query 1 417 use `test`; drop table t1
-master-bin.000001 417 Query 1 521 use `test`; create table t1 (word char(20) not null)
-master-bin.000001 521 Begin_load_query 1 1125 ;file_id=1;block_len=581
-master-bin.000001 1125 Execute_load_query 1 1274 use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
-master-bin.000001 1274 Query 1 1351 use `test`; drop table t1
-master-bin.000001 1351 Rotate 1 1395 master-bin.000002;pos=4
+master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
+master-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 224 Intvar 1 252 INSERT_ID=1
+master-bin.000001 252 Query 1 344 use `test`; insert into t1 values (NULL)
+master-bin.000001 344 Query 1 421 use `test`; drop table t1
+master-bin.000001 421 Query 1 525 use `test`; create table t1 (word char(20) not null)
+master-bin.000001 525 Begin_load_query 1 1129 ;file_id=1;block_len=581
+master-bin.000001 1129 Execute_load_query 1 1278 use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
+master-bin.000001 1278 Query 1 1355 use `test`; drop table t1
+master-bin.000001 1355 Rotate 1 1399 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 98 Server ver: VERSION, Binlog ver: 4
-master-bin.000002 98 Query 1 185 use `test`; create table t5 (a int)
-master-bin.000002 185 Query 1 262 use `test`; drop table t5
-master-bin.000002 262 Query 1 349 use `test`; create table t1 (n int)
-master-bin.000002 349 Query 1 438 use `test`; insert into t1 values (1)
-master-bin.000002 438 Query 1 515 use `test`; drop table t1
+master-bin.000002 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
+master-bin.000002 102 Query 1 189 use `test`; create table t5 (a int)
+master-bin.000002 189 Query 1 266 use `test`; drop table t5
+master-bin.000002 266 Query 1 353 use `test`; create table t1 (n int)
+master-bin.000002 353 Query 1 442 use `test`; insert into t1 values (1)
+master-bin.000002 442 Query 1 519 use `test`; drop table t1
show binary logs;
Log_name
master-bin.000001
@@ -78,26 +78,26 @@
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 98 Server ver: VERSION, Binlog ver: 4
-slave-bin.000001 98 Query 1 220 use `test`; create table t1(n int not null auto_increment primary key)
-slave-bin.000001 220 Intvar 1 248 INSERT_ID=1
-slave-bin.000001 248 Query 1 340 use `test`; insert into t1 values (NULL)
-slave-bin.000001 340 Query 1 417 use `test`; drop table t1
-slave-bin.000001 417 Query 1 521 use `test`; create table t1 (word char(20) not null)
-slave-bin.000001 521 Begin_load_query 1 1125 ;file_id=1;block_len=581
-slave-bin.000001 1125 Execute_load_query 1 1283 use `test`; load data INFILE '../../var/tmp/SQL_LOAD-2-1-1.data' INTO table t1 ignore 1 lines ;file_id=1
-slave-bin.000001 1283 Query 1 1360 use `test`; drop table t1
-slave-bin.000001 1360 Query 1 1447 use `test`; create table t5 (a int)
-slave-bin.000001 1447 Query 1 1524 use `test`; drop table t5
-slave-bin.000001 1524 Rotate 2 1567 slave-bin.000002;pos=4
+slave-bin.000001 4 Format_desc 2 102 Server ver: VERSION, Binlog ver: 4
+slave-bin.000001 102 Query 1 224 use `test`; create table t1(n int not null auto_increment primary key)
+slave-bin.000001 224 Intvar 1 252 INSERT_ID=1
+slave-bin.000001 252 Query 1 344 use `test`; insert into t1 values (NULL)
+slave-bin.000001 344 Query 1 421 use `test`; drop table t1
+slave-bin.000001 421 Query 1 525 use `test`; create table t1 (word char(20) not null)
+slave-bin.000001 525 Begin_load_query 1 1129 ;file_id=1;block_len=581
+slave-bin.000001 1129 Execute_load_query 1 1287 use `test`; load data INFILE '../../var/tmp/SQL_LOAD-2-1-1.data' INTO table t1 ignore 1 lines ;file_id=1
+slave-bin.000001 1287 Query 1 1364 use `test`; drop table t1
+slave-bin.000001 1364 Query 1 1451 use `test`; create table t5 (a int)
+slave-bin.000001 1451 Query 1 1528 use `test`; drop table t5
+slave-bin.000001 1528 Rotate 2 1571 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 98 Server ver: VERSION, Binlog ver: 4
-slave-bin.000002 98 Query 1 185 use `test`; create table t1 (n int)
-slave-bin.000002 185 Query 1 274 use `test`; insert into t1 values (1)
-slave-bin.000002 274 Query 1 351 use `test`; drop table t1
+slave-bin.000002 4 Format_desc 2 102 Server ver: VERSION, Binlog ver: 4
+slave-bin.000002 102 Query 1 189 use `test`; create table t1 (n int)
+slave-bin.000002 189 Query 1 278 use `test`; insert into t1 values (1)
+slave-bin.000002 278 Query 1 355 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 515 # # master-bin.000002 Yes Yes 0 0 515 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 519 # # master-bin.000002 Yes Yes 0 0 519 # 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
--- 1.30/mysql-test/r/user_var.result 2005-03-22 09:32:43 +01:00
+++ 1.31/mysql-test/r/user_var.result 2005-04-08 11:40:42 +02:00
@@ -176,7 +176,7 @@
set @var1= "';aaa";
SET @var2=char(ascii('a'));
insert into t1 values (@var1),(@var2);
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # User var 1 # @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
master-bin.000001 # Query 1 # use `test`; INSERT INTO t1 VALUES(@`a b`)
--- 1.4/mysql-test/r/binlog.result 2005-03-16 21:12:22 +01:00
+++ 1.5/mysql-test/r/binlog.result 2005-04-08 11:40:41 +02:00
@@ -8,7 +8,7 @@
begin;
insert t2 values (5);
commit;
-show binlog events from 98;
+show binlog events from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # use `test`; create table t1 (a int) engine=bdb
master-bin.000001 # Query 1 # use `test`; create table t2 (a int) engine=innodb
@@ -24,7 +24,7 @@
begin;
commit;
drop table t1;
-show binlog events in 'master-bin.000001' from 98;
+show binlog events in 'master-bin.000001' from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # use `test`; create table t1 (n int) engine=innodb
master-bin.000001 # Query 1 # use `test`; BEGIN
@@ -130,6 +130,6 @@
master-bin.000001 # Query 1 # use `test`; insert into t1 values(1 + 4)
master-bin.000001 # Xid 1 # COMMIT /* xid=18 */
master-bin.000001 # Rotate 1 # master-bin.000002;pos=4
-show binlog events in 'master-bin.000002' from 98;
+show binlog events in 'master-bin.000002' from 102;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000002 # Query 1 # use `test`; drop table t1
| Thread |
|---|
| • bk commit into 5.1 tree (mats:1.1800) | Mats Kindahl | 8 Apr |
