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.1798 05/03/22 09:32:47 mats@stripped +28 -0
Merge with 5.1 main branch
mysql-test/r/user_var.result
1.30 05/03/22 09:32:43 mats@stripped +0 -6
Merge with 5.1 main branch
mysql-test/r/rpl_user_variables.result
1.16 05/03/22 09:32:43 mats@stripped +0 -29
Merge with 5.1 main branch
mysql-test/r/rpl_until.result
1.22 05/03/22 09:32:43 mats@stripped +13 -19
Merge with 5.1 main branch
mysql-test/r/rpl_timezone.result
1.10 05/03/22 09:32:43 mats@stripped +0 -7
Merge with 5.1 main branch
mysql-test/r/rpl_temporary.result
1.19 05/03/22 09:32:43 mats@stripped +0 -13
Merge with 5.1 main branch
mysql-test/r/rpl_server_id2.result
1.10 05/03/22 09:32:43 mats@stripped +0 -1
Merge with 5.1 main branch
mysql-test/r/rpl_server_id1.result
1.9 05/03/22 09:32:43 mats@stripped +0 -1
Merge with 5.1 main branch
mysql-test/r/rpl_rotate_logs.result
1.68 05/03/22 09:32:43 mats@stripped +0 -4
Merge with 5.1 main branch
mysql-test/r/rpl_reset_slave.result
1.15 05/03/22 09:32:43 mats@stripped +0 -3
Merge with 5.1 main branch
mysql-test/r/rpl_replicate_do.result
1.30 05/03/22 09:32:43 mats@stripped +0 -1
Merge with 5.1 main branch
mysql-test/r/rpl_relayrotate.result
1.18 05/03/22 09:32:43 mats@stripped +0 -1
Merge with 5.1 main branch
mysql-test/r/rpl_multi_query.result
1.5 05/03/22 09:32:43 mats@stripped +0 -1
Merge with 5.1 main branch
mysql-test/r/rpl_max_relay_size.result
1.21 05/03/22 09:32:43 mats@stripped +0 -6
Merge with 5.1 main branch
mysql-test/r/rpl_log_pos.result
1.44 05/03/22 09:32:43 mats@stripped +6 -10
Merge with 5.1 main branch
mysql-test/r/rpl_log.result
1.58 05/03/22 09:32:43 mats@stripped +0 -51
Merge with 5.1 main branch
mysql-test/r/rpl_loaddata_rule_s.result
1.9 05/03/22 09:32:43 mats@stripped +0 -1
Merge with 5.1 main branch
mysql-test/r/rpl_loaddata_rule_m.result
1.15 05/03/22 09:32:43 mats@stripped +0 -3
Merge with 5.1 main branch
mysql-test/r/rpl_loaddata.result
1.29 05/03/22 09:32:43 mats@stripped +0 -4
Merge with 5.1 main branch
mysql-test/r/rpl_flush_tables.result
1.13 05/03/22 09:32:43 mats@stripped +0 -17
Merge with 5.1 main branch
mysql-test/r/rpl_flush_log_loop.result
1.24 05/03/22 09:32:43 mats@stripped +0 -1
Merge with 5.1 main branch
mysql-test/r/rpl_error_ignored_table.result
1.21 05/03/22 09:32:43 mats@stripped +0 -11
Merge with 5.1 main branch
mysql-test/r/rpl_deadlock.result
1.4 05/03/22 09:32:43 mats@stripped +0 -5
Merge with 5.1 main branch
mysql-test/r/rpl_charset.result
1.20 05/03/22 09:32:43 mats@stripped +0 -1
Merge with 5.1 main branch
mysql-test/r/rpl_change_master.result
1.18 05/03/22 09:32:43 mats@stripped +0 -2
Merge with 5.1 main branch
mysql-test/r/rpl000015.result
1.36 05/03/22 09:32:43 mats@stripped +0 -2
Merge with 5.1 main branch
mysql-test/r/mix_innodb_myisam_binlog.result
1.22 05/03/22 09:32:43 mats@stripped +0 -62
Merge with 5.1 main branch
mysql-test/r/insert_select.result
1.28 05/03/22 09:32:43 mats@stripped +0 -3
Merge with 5.1 main branch
mysql-test/r/ctype_ucs.result
1.33 05/03/22 09:32:43 mats@stripped +0 -3
Merge with 5.1 main branch
# 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/RESYNC
--- 1.32/mysql-test/r/ctype_ucs.result 2005-03-21 19:24:54 +01:00
+++ 1.33/mysql-test/r/ctype_ucs.result 2005-03-22 09:32:43 +01:00
@@ -523,10 +523,10 @@
set @v=convert('abc' using ucs2);
reset master;
insert into t2 values (@v);
-show binlog events from 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 User var 1 140 @`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci
-master-bin.000001 140 Query 1 230 use `test`; insert into t2 values (@v)
+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)
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
ROLLBACK;
--- 1.9/mysql-test/r/rpl_timezone.result 2005-03-21 19:24:55 +01:00
+++ 1.10/mysql-test/r/rpl_timezone.result 2005-03-22 09:32:43 +01:00
@@ -32,13 +32,13 @@
2004-06-11 09:39:02
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 100 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 100 Query 1 193 use `test`; create table t1 (t timestamp)
-master-bin.000001 193 Query 1 285 use `test`; create table t2 (t char(32))
-master-bin.000001 285 Query 1 377 use `test`; SET ONE_SHOT TIME_ZONE='UTC'
-master-bin.000001 377 Query 1 501 use `test`; insert into t1 values ('20040101000000'), ('20040611093902')
-master-bin.000001 501 Query 1 579 use `test`; delete from t1
-master-bin.000001 579 Query 1 703 use `test`; insert into t1 values ('20040101000000'), ('20040611093902')
+master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
+master-bin.000001 # Query 1 # use `test`; create table t1 (t timestamp)
+master-bin.000001 # Query 1 # use `test`; create table t2 (t char(32))
+master-bin.000001 # Query 1 # use `test`; SET ONE_SHOT TIME_ZONE='UTC'
+master-bin.000001 # Query 1 # use `test`; insert into t1 values ('20040101000000'), ('20040611093902')
+master-bin.000001 # Query 1 # use `test`; delete from t1
+master-bin.000001 # Query 1 # use `test`; insert into t1 values ('20040101000000'), ('20040611093902')
set time_zone='MET';
insert into t2 (select t from t1);
select * from t1;
--- 1.21/mysql-test/r/rpl_until.result 2005-03-21 19:24:55 +01:00
+++ 1.22/mysql-test/r/rpl_until.result 2005-03-22 09:32:43 +01: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 100 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 100 Query 1 222 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 222 Query 1 323 use `test`; insert into t1 values (1),(2),(3),(4)
-master-bin.000001 323 Query 1 400 use `test`; drop table t1
-master-bin.000001 400 Query 1 522 use `test`; create table t2(n int not null auto_increment primary key)
-master-bin.000001 522 Query 1 615 use `test`; insert into t2 values (1),(2)
-master-bin.000001 615 Query 1 708 use `test`; insert into t2 values (3),(4)
-master-bin.000001 708 Query 1 785 use `test`; drop table t2
-start slave until master_log_file='master-bin.000001', master_log_pos=308;
+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;
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 785 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 323 # Master master-bin.000001 308 No #
-start slave until master_log_file='master-no-such-bin.000001', master_log_pos=295;
+# 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;
select * from t1;
n
1
@@ -41,32 +41,32 @@
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 785 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 323 # Master master-no-such-bin.000001 295 No #
-start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=710;
+# 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 #
+start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=751;
select * from t2;
n
1
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 785 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 615 # Relay slave-relay-bin.000004 710 No #
+# 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 #
start slave;
stop slave;
-start slave until master_log_file='master-bin.000001', master_log_pos=714;
+start slave until master_log_file='master-bin.000001', master_log_pos=783;
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 785 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 785 # Master master-bin.000001 714 No #
-start slave until master_log_file='master-bin', master_log_pos=565;
+# 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;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
-start slave until master_log_file='master-bin.000001', master_log_pos=565, relay_log_pos=16;
+start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12;
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=565;
+start slave until relay_log_file='slave-relay-bin.000002', master_log_pos=561;
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=714;
+start slave until master_log_file='master-bin.000001', master_log_pos=783;
Warnings:
Note 1254 Slave is already running
--- 1.15/mysql-test/r/rpl_user_variables.result 2005-03-21 19:24:55 +01:00
+++ 1.16/mysql-test/r/rpl_user_variables.result 2005-03-22 09:32:43 +01:00
@@ -76,35 +76,35 @@
NULL
NULL
NULL
-show binlog events from 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-slave-bin.000001 100 Query 1 191 use `test`; create table t1(n char(30))
-slave-bin.000001 191 User var 2 234 @`i1`=12345678901234
-slave-bin.000001 234 User var 2 277 @`i2`=-12345678901234
-slave-bin.000001 277 User var 2 320 @`i3`=0
-slave-bin.000001 320 User var 2 363 @`i4`=-1
-slave-bin.000001 363 Query 1 475 use `test`; insert into t1 values (@i1), (@i2), (@i3), (@i4)
-slave-bin.000001 475 User var 2 514 @`r1`=12.5
-slave-bin.000001 514 User var 2 553 @`r2`=-12.5
-slave-bin.000001 553 Query 1 651 use `test`; insert into t1 values (@r1), (@r2)
-slave-bin.000001 651 User var 2 700 @`s1`=_latin1 0x5468697320697320612074657374 COLLATE latin1_swedish_ci
-slave-bin.000001 700 User var 2 735 @`s2`=_latin1 "" COLLATE latin1_swedish_ci
-slave-bin.000001 735 User var 2 777 @`s3`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci
-slave-bin.000001 777 User var 2 819 @`s4`=_latin1 0x6162635C646566 COLLATE latin1_swedish_ci
-slave-bin.000001 819 User var 2 861 @`s5`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci
-slave-bin.000001 861 Query 1 980 use `test`; insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5)
-slave-bin.000001 980 User var 2 1006 @`n1`=NULL
-slave-bin.000001 1006 Query 1 1097 use `test`; insert into t1 values (@n1)
-slave-bin.000001 1097 User var 2 1123 @`n2`=NULL
-slave-bin.000001 1123 Query 1 1214 use `test`; insert into t1 values (@n2)
-slave-bin.000001 1214 Query 1 1331 use `test`; insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1)
-slave-bin.000001 1331 User var 2 1373 @`a`=2
-slave-bin.000001 1373 Query 1 1474 use `test`; insert into t1 values (@a+(@b:=@a+1))
-slave-bin.000001 1474 User var 2 1511 @`q`=_latin1 0x616263 COLLATE latin1_swedish_ci
-slave-bin.000001 1511 Query 1 1644 use `test`; insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2'))
-slave-bin.000001 1644 User var 2 1686 @`a`=5
-slave-bin.000001 1686 Query 1 1781 use `test`; insert into t1 values (@a),(@a)
-slave-bin.000001 1781 User var 2 1806 @`a`=NULL
-slave-bin.000001 1806 Query 1 1908 use `test`; insert into t1 values (@a),(@a),(@a*5)
+slave-bin.000001 # Query 1 # use `test`; create table t1(n char(30))
+slave-bin.000001 # User var 2 # @`i1`=12345678901234
+slave-bin.000001 # User var 2 # @`i2`=-12345678901234
+slave-bin.000001 # User var 2 # @`i3`=0
+slave-bin.000001 # User var 2 # @`i4`=-1
+slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@i1), (@i2), (@i3), (@i4)
+slave-bin.000001 # User var 2 # @`r1`=12.5
+slave-bin.000001 # User var 2 # @`r2`=-12.5
+slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@r1), (@r2)
+slave-bin.000001 # User var 2 # @`s1`=_latin1 0x5468697320697320612074657374 COLLATE latin1_swedish_ci
+slave-bin.000001 # User var 2 # @`s2`=_latin1 "" COLLATE latin1_swedish_ci
+slave-bin.000001 # User var 2 # @`s3`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci
+slave-bin.000001 # User var 2 # @`s4`=_latin1 0x6162635C646566 COLLATE latin1_swedish_ci
+slave-bin.000001 # User var 2 # @`s5`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci
+slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5)
+slave-bin.000001 # User var 2 # @`n1`=NULL
+slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@n1)
+slave-bin.000001 # User var 2 # @`n2`=NULL
+slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@n2)
+slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1)
+slave-bin.000001 # User var 2 # @`a`=2
+slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@a+(@b:=@a+1))
+slave-bin.000001 # User var 2 # @`q`=_latin1 0x616263 COLLATE latin1_swedish_ci
+slave-bin.000001 # Query 1 # use `test`; insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2'))
+slave-bin.000001 # User var 2 # @`a`=5
+slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@a),(@a)
+slave-bin.000001 # User var 2 # @`a`=NULL
+slave-bin.000001 # Query 1 # use `test`; insert into t1 values (@a),(@a),(@a*5)
drop table t1;
stop slave;
--- 1.21/mysql-test/r/mix_innodb_myisam_binlog.result 2005-03-21 19:24:54 +01:00
+++ 1.22/mysql-test/r/mix_innodb_myisam_binlog.result 2005-03-22 09:32:43 +01:00
@@ -6,12 +6,12 @@
insert into t1 values(1);
insert into t2 select * from t1;
commit;
-show binlog events from 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 Query 1 # use `test`; BEGIN
-master-bin.000001 169 Query 1 # use `test`; insert into t1 values(1)
-master-bin.000001 257 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 352 Xid 1 # COMMIT /* xid=7 */
+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 */
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 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 Query 1 # use `test`; BEGIN
-master-bin.000001 169 Query 1 # use `test`; insert into t1 values(2)
-master-bin.000001 257 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 352 Query 1 # use `test`; ROLLBACK
+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
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 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 Query 1 # use `test`; BEGIN
-master-bin.000001 169 Query 1 # use `test`; insert into t1 values(3)
-master-bin.000001 257 Query 1 # use `test`; savepoint my_savepoint
-master-bin.000001 343 Query 1 # use `test`; insert into t1 values(4)
-master-bin.000001 431 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 526 Query 1 # use `test`; rollback to savepoint my_savepoint
-master-bin.000001 624 Xid 1 # COMMIT /* xid=24 */
+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 */
delete from t1;
delete from t2;
reset master;
@@ -65,16 +65,16 @@
a
5
7
-show binlog events from 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 Query 1 # use `test`; BEGIN
-master-bin.000001 169 Query 1 # use `test`; insert into t1 values(5)
-master-bin.000001 257 Query 1 # use `test`; savepoint my_savepoint
-master-bin.000001 343 Query 1 # use `test`; insert into t1 values(6)
-master-bin.000001 431 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 526 Query 1 # use `test`; rollback to savepoint my_savepoint
-master-bin.000001 624 Query 1 # use `test`; insert into t1 values(7)
-master-bin.000001 712 Xid 1 # COMMIT /* xid=36 */
+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 */
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 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 Query 1 # use `test`; BEGIN
-master-bin.000001 169 Query 1 # use `test`; insert into t1 values(8)
-master-bin.000001 257 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 352 Query 1 # use `test`; ROLLBACK
+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
delete from t1;
delete from t2;
reset master;
insert into t1 values(9);
insert into t2 select * from t1;
-show binlog events from 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 Query 1 # use `test`; insert into t1 values(9)
-master-bin.000001 188 Xid 1 # COMMIT /* xid=59 */
-master-bin.000001 215 Query 1 # use `test`; insert into t2 select * from t1
+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
delete from t1;
delete from t2;
reset master;
insert into t1 values(10);
begin;
insert into t2 select * from t1;
-show binlog events from 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 Query 1 # use `test`; insert into t1 values(10)
-master-bin.000001 189 Xid 1 # COMMIT /* xid=65 */
-master-bin.000001 216 Query 1 # use `test`; insert into t2 select * from t1
+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
insert into t1 values(11);
commit;
-show binlog events from 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 Query 1 # use `test`; insert into t1 values(10)
-master-bin.000001 189 Xid 1 # COMMIT /* xid=65 */
-master-bin.000001 216 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 311 Query 1 # use `test`; BEGIN
-master-bin.000001 380 Query 1 # use `test`; insert into t1 values(11)
-master-bin.000001 469 Xid 1 # COMMIT /* xid=67 */
+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 */
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 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 Query 1 # use `test`; BEGIN
-master-bin.000001 169 Query 1 # use `test`; insert into t1 values(12)
-master-bin.000001 258 Query 1 # use `test`; insert into t2 select * from t1
-master-bin.000001 353 Xid 1 # COMMIT /* xid=77 */
+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 */
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 100;
+show binlog events from 98;
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 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 Query 1 # use `test`; BEGIN
-master-bin.000001 169 Query 1 # use `test`; insert into t1 values(14)
-master-bin.000001 258 Xid 1 # COMMIT /* xid=93 */
+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 */
delete from t1;
delete from t2;
reset master;
@@ -177,12 +177,12 @@
a
16
18
-show binlog events from 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 Query 1 # use `test`; BEGIN
-master-bin.000001 169 Query 1 # use `test`; insert into t1 values(16)
-master-bin.000001 258 Query 1 # use `test`; insert into t1 values(18)
-master-bin.000001 347 Xid 1 # COMMIT /* xid=104 */
+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 */
delete from t1;
delete from t2;
alter table t2 type=MyISAM;
--- 1.17/mysql-test/r/rpl_change_master.result 2005-03-21 19:24:54 +01:00
+++ 1.18/mysql-test/r/rpl_change_master.result 2005-03-22 09:32:43 +01: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 362 # # master-bin.000001 No No 0 0 186 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 360 # # master-bin.000001 No No 0 0 184 # 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 186 # # master-bin.000001 No No 0 0 186 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 184 # # master-bin.000001 No No 0 0 184 # None 0 No #
start slave;
select * from t1;
n
--- 1.19/mysql-test/r/rpl_charset.result 2005-03-21 19:24:54 +01:00
+++ 1.20/mysql-test/r/rpl_charset.result 2005-03-22 09:32:43 +01:00
@@ -103,7 +103,7 @@
1 cp850_general_ci
drop database mysqltest2;
drop database mysqltest3;
-show binlog events from 100;
+show binlog events from 98;
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.20/mysql-test/r/rpl_error_ignored_table.result 2005-03-21 19:24:54 +01:00
+++ 1.21/mysql-test/r/rpl_error_ignored_table.result 2005-03-22 09:32:43 +01: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 292 # # master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 292 # None 0 No #
+# 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 #
show tables like 't1';
Tables_in_test (t1)
drop table t1;
@@ -26,14 +26,14 @@
0
kill @id;
drop table t2,t3;
-show binlog events from 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 Query 1 199 use `test`; create table t1 (a int primary key)
-master-bin.000001 199 Query 1 292 use `test`; insert into t1 values (1),(1)
-master-bin.000001 292 Query 1 369 use `test`; drop table t1
-master-bin.000001 369 Query 1 468 use `test`; create table t2 (a int primary key)
-master-bin.000001 468 Query 1 556 use `test`; insert into t2 values(1)
-master-bin.000001 556 Query 1 644 use `test`; create table t3 (id int)
-master-bin.000001 644 Query 1 746 use `test`; insert into t3 values(connection_id())
-master-bin.000001 746 Query 1 866 use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10)
-master-bin.000001 866 Query 1 946 use `test`; drop table t2,t3
+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)
+master-bin.000001 # Query 1 # use `test`; drop table t1
+master-bin.000001 # Query 1 # use `test`; create table t2 (a int primary key)
+master-bin.000001 # Query 1 # use `test`; insert into t2 values(1)
+master-bin.000001 # Query 1 # use `test`; create table t3 (id int)
+master-bin.000001 # Query 1 # use `test`; insert into t3 values(connection_id())
+master-bin.000001 # Query 1 # use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10)
+master-bin.000001 # Query 1 # use `test`; drop table t2,t3
--- 1.12/mysql-test/r/rpl_flush_tables.result 2005-03-21 19:24:54 +01:00
+++ 1.13/mysql-test/r/rpl_flush_tables.result 2005-03-22 09:32:43 +01:00
@@ -14,27 +14,27 @@
flush no_write_to_binlog tables;
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 100 Server ver: SERVER_VERSION, Binlog ver: 4
-master-bin.000001 100 Query 1 187 use `test`; create table t1 (a int)
-master-bin.000001 187 Query 1 277 use `test`; insert into t1 values (10)
-master-bin.000001 277 Query 1 364 use `test`; create table t2 (a int)
-master-bin.000001 364 Query 1 474 use `test`; create table t3 (a int) engine=merge union(t1)
-master-bin.000001 474 Query 1 561 use `test`; create table t4 (a int)
-master-bin.000001 561 Query 1 656 use `test`; insert into t4 select * from t3
-master-bin.000001 656 Query 1 751 use `test`; rename table t1 to t5, t2 to t1
+master-bin.000001 # Format_desc 1 # Server ver: SERVER_VERSION, Binlog ver: 4
+master-bin.000001 # Query 1 # use `test`; create table t1 (a int)
+master-bin.000001 # Query 1 # use `test`; insert into t1 values (10)
+master-bin.000001 # Query 1 # use `test`; create table t2 (a int)
+master-bin.000001 # Query 1 # use `test`; create table t3 (a int) engine=merge union(t1)
+master-bin.000001 # Query 1 # use `test`; create table t4 (a int)
+master-bin.000001 # Query 1 # use `test`; insert into t4 select * from t3
+master-bin.000001 # Query 1 # use `test`; rename table t1 to t5, t2 to t1
select * from t3;
a
flush tables;
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 100 Server ver: SERVER_VERSION, Binlog ver: 4
-master-bin.000001 100 Query 1 187 use `test`; create table t1 (a int)
-master-bin.000001 187 Query 1 277 use `test`; insert into t1 values (10)
-master-bin.000001 277 Query 1 364 use `test`; create table t2 (a int)
-master-bin.000001 364 Query 1 474 use `test`; create table t3 (a int) engine=merge union(t1)
-master-bin.000001 474 Query 1 561 use `test`; create table t4 (a int)
-master-bin.000001 561 Query 1 656 use `test`; insert into t4 select * from t3
-master-bin.000001 656 Query 1 751 use `test`; rename table t1 to t5, t2 to t1
-master-bin.000001 751 Query 1 827 use `test`; flush tables
+master-bin.000001 # Format_desc 1 # Server ver: SERVER_VERSION, Binlog ver: 4
+master-bin.000001 # Query 1 # use `test`; create table t1 (a int)
+master-bin.000001 # Query 1 # use `test`; insert into t1 values (10)
+master-bin.000001 # Query 1 # use `test`; create table t2 (a int)
+master-bin.000001 # Query 1 # use `test`; create table t3 (a int) engine=merge union(t1)
+master-bin.000001 # Query 1 # use `test`; create table t4 (a int)
+master-bin.000001 # Query 1 # use `test`; insert into t4 select * from t3
+master-bin.000001 # Query 1 # use `test`; rename table t1 to t5, t2 to t1
+master-bin.000001 # Query 1 # use `test`; flush tables
select * from t3;
a
--- 1.14/mysql-test/r/rpl_loaddata_rule_m.result 2005-03-21 19:24:54 +01:00
+++ 1.15/mysql-test/r/rpl_loaddata_rule_m.result 2005-03-22 09:32:43 +01:00
@@ -10,8 +10,10 @@
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 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 Query 1 202 drop database if exists mysqltest
-master-bin.000001 202 Query 1 296 create database mysqltest
+master-bin.000001 # Query 1 # drop database if exists mysqltest
+master-bin.000001 # Query 1 # create database mysqltest
+master-bin.000001 # Begin_load_query 1 # ;file_id=1;block_len=12
+master-bin.000001 # Execute_load_query 1 # use `mysqltest`; load data infile '../../std_data/rpl_loaddata.dat' into table test.t1 ;file_id=1
drop database mysqltest;
--- 1.8/mysql-test/r/rpl_loaddata_rule_s.result 2005-03-21 19:24:54 +01:00
+++ 1.9/mysql-test/r/rpl_loaddata_rule_s.result 2005-03-22 09:32:43 +01:00
@@ -10,5 +10,5 @@
select count(*) from t1;
count(*)
2
-show binlog events from 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
--- 1.20/mysql-test/r/rpl_max_relay_size.result 2005-03-21 19:24:55 +01:00
+++ 1.21/mysql-test/r/rpl_max_relay_size.result 2005-03-22 09:32:43 +01: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 73756 # # master-bin.000001 Yes Yes 0 0 73756 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73754 # # master-bin.000001 Yes Yes 0 0 73754 # 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 73756 # # master-bin.000001 Yes Yes 0 0 73756 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73754 # # master-bin.000001 Yes Yes 0 0 73754 # 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 73756 # # master-bin.000001 Yes Yes 0 0 73756 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73754 # # master-bin.000001 Yes Yes 0 0 73754 # 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 73843 # # master-bin.000001 Yes Yes 0 0 73843 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73841 # # master-bin.000001 Yes Yes 0 0 73841 # 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 73920 # # master-bin.000001 Yes Yes 0 0 73920 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73918 # # master-bin.000001 Yes Yes 0 0 73918 # None 0 No #
flush logs;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000002 100
+master-bin.000002 98
--- 1.17/mysql-test/r/rpl_relayrotate.result 2005-03-21 19:24:55 +01:00
+++ 1.18/mysql-test/r/rpl_relayrotate.result 2005-03-22 09:32:43 +01: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 743190 # # master-bin.000001 Yes Yes 0 0 743190 # None 0 No #
+# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 743188 # # master-bin.000001 Yes Yes 0 0 743188 # None 0 No #
drop table t1;
--- 1.14/mysql-test/r/rpl_reset_slave.result 2005-03-21 19:24:55 +01:00
+++ 1.15/mysql-test/r/rpl_reset_slave.result 2005-03-22 09:32:43 +01: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 100 # # master-bin.000001 Yes Yes 0 0 100 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 98 # # master-bin.000001 Yes Yes 0 0 98 # 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 100 # # master-bin.000001 No No 0 0 100 # None 0 No #
+# 127.0.0.1 test MASTER_PORT 1 master-bin.000001 98 # # master-bin.000001 No No 0 0 98 # 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 100 # # master-bin.000001 Yes Yes 0 0 100 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 98 # # master-bin.000001 Yes Yes 0 0 98 # None 0 No #
stop slave;
reset slave;
start slave;
--- 1.8/mysql-test/r/rpl_server_id1.result 2005-03-21 19:24:55 +01:00
+++ 1.9/mysql-test/r/rpl_server_id1.result 2005-03-22 09:32:43 +01: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 100 None 0 No NULL
+ 127.0.0.1 root SLAVE_PORT 1 4 slave-relay-bin.000001 4 No No # 0 0 0 98 None 0 No NULL
start slave;
insert into t1 values (1);
show status like "slave_running";
--- 1.9/mysql-test/r/rpl_server_id2.result 2005-03-21 19:24:55 +01:00
+++ 1.10/mysql-test/r/rpl_server_id2.result 2005-03-22 09:32:43 +01: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 100 None 0 No NULL
+ 127.0.0.1 root SLAVE_PORT 1 4 slave-relay-bin.000001 4 No No # 0 0 0 98 None 0 No NULL
start slave;
insert into t1 values (1);
select * from t1;
--- 1.27/mysql-test/r/insert_select.result 2005-03-21 19:24:54 +01:00
+++ 1.28/mysql-test/r/insert_select.result 2005-03-22 09:32:43 +01:00
@@ -74,8 +74,8 @@
ERROR 23000: Duplicate entry '2' for key 1
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 100 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 100 Query 1 195 use `test`; insert into t1 select * from t2
+master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
+master-bin.000001 # Query 1 # use `test`; insert into t1 select * from t2
select * from t1;
a
1
@@ -88,7 +88,7 @@
ERROR 23000: Duplicate entry '1' for key 1
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 100 Server ver: VERSION, Binlog ver: 4
+master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
drop table t1;
create table t1 (a int not null);
create table t2 (a int not null);
--- 1.23/mysql-test/r/rpl_flush_log_loop.result 2005-03-21 19:24:54 +01:00
+++ 1.24/mysql-test/r/rpl_flush_log_loop.result 2005-03-22 09:32:43 +01: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 211 # # slave-bin.000001 Yes Yes 0 0 211 # None 0 No #
+# 127.0.0.1 root SLAVE_PORT 60 slave-bin.000001 209 # # slave-bin.000001 Yes Yes 0 0 209 # None 0 No #
--- 1.28/mysql-test/r/rpl_loaddata.result 2005-03-21 19:24:54 +01:00
+++ 1.29/mysql-test/r/rpl_loaddata.result 2005-03-22 09:32:43 +01: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 1101
+slave-bin.000001 1292
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 1564 # # master-bin.000001 Yes Yes 0 0 1564 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1800 # # master-bin.000001 Yes Yes 0 0 1800 # 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 1672 # # master-bin.000001 No No 0 0 1672 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1835 # # master-bin.000001 No No 0 0 1835 # 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 541
+master-bin.000001 441
drop table t2;
--- 1.29/mysql-test/r/rpl_replicate_do.result 2005-03-21 19:24:55 +01:00
+++ 1.30/mysql-test/r/rpl_replicate_do.result 2005-03-22 09:32:43 +01: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 1622 # # master-bin.000001 Yes Yes test.t1 0 0 1622 # None 0 No #
+# 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 #
--- 1.43/mysql-test/r/rpl_log_pos.result 2005-03-21 19:24:55 +01:00
+++ 1.44/mysql-test/r/rpl_log_pos.result 2005-03-22 09:32:43 +01:00
@@ -6,37 +6,37 @@
start slave;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 100
+master-bin.000001 98
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 100 # # master-bin.000001 Yes Yes 0 0 100 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 98 # # master-bin.000001 Yes Yes 0 0 98 # None 0 No #
stop slave;
-change master to master_log_pos=74;
+change master to master_log_pos=73;
start slave;
stop slave;
-change master to master_log_pos=74;
+change master to master_log_pos=73;
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 74 # # master-bin.000001 No No 0 0 74 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73 # # master-bin.000001 No No 0 0 73 # 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 74 # # master-bin.000001 No Yes 0 0 74 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 73 # # master-bin.000001 No Yes 0 0 73 # None 0 No #
stop slave;
-change master to master_log_pos=177;
+change master to master_log_pos=173;
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 177 # # master-bin.000001 No Yes 0 0 177 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 173 # # master-bin.000001 No Yes 0 0 173 # None 0 No #
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 100
+master-bin.000001 98
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=100;
+change master to master_log_pos=98;
start slave;
select * from t1;
n
--- 1.35/mysql-test/r/rpl000015.result 2005-03-21 19:24:54 +01:00
+++ 1.36/mysql-test/r/rpl000015.result 2005-03-22 09:32:43 +01:00
@@ -1,7 +1,7 @@
reset master;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
-master-bin.000001 100
+master-bin.000001 98
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 100 # # master-bin.000001 Yes Yes 0 0 100 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 7 master-bin.000001 98 # # master-bin.000001 Yes Yes 0 0 98 # None 0 No #
drop table if exists t1;
create table t1 (n int);
insert into t1 values (10),(45),(90);
--- 1.67/mysql-test/r/rpl_rotate_logs.result 2005-03-21 19:24:55 +01:00
+++ 1.68/mysql-test/r/rpl_rotate_logs.result 2005-03-22 09:32:43 +01: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 554 # # master-bin.000001 Yes Yes 0 0 554 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 60 master-bin.000001 552 # # master-bin.000001 Yes Yes 0 0 552 # 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 502 # # master-bin.000003 Yes Yes 0 0 502 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 60 master-bin.000003 500 # # master-bin.000003 Yes Yes 0 0 500 # 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 2148
+master-bin.000005 2146
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 2148 # # master-bin.000005 Yes Yes 0 0 2148 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 60 master-bin.000005 2146 # # master-bin.000005 Yes Yes 0 0 2146 # None 0 No #
lock tables t3 read;
select count(*) from t3 where n >= 4;
count(*)
--- 1.57/mysql-test/r/rpl_log.result 2005-03-21 19:24:54 +01:00
+++ 1.58/mysql-test/r/rpl_log.result 2005-03-22 09:32:43 +01: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 100 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 100 Query 1 222 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 222 Intvar 1 250 INSERT_ID=1
-master-bin.000001 250 Query 1 342 use `test`; insert into t1 values (NULL)
-master-bin.000001 342 Query 1 419 use `test`; drop table t1
-master-bin.000001 419 Query 1 523 use `test`; create table t1 (word char(20) not null)
-master-bin.000001 523 Create_file 1 1193 db=test;table=t1;file_id=1;block_len=581
-master-bin.000001 1193 Exec_load 1 1216 ;file_id=1
-master-bin.000001 1216 Query 1 1293 use `test`; drop table t1
-show binlog events from 100 limit 1;
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 Query 1 222 use `test`; create table t1(n int not null auto_increment primary key)
-show binlog events from 100 limit 2;
-Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 Query 1 222 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 222 Intvar 1 250 INSERT_ID=1
-show binlog events from 100 limit 2,1;
+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;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 250 Query 1 342 use `test`; insert into t1 values (NULL)
+master-bin.000001 248 Query 1 340 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 100 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 100 Query 1 222 use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001 222 Intvar 1 250 INSERT_ID=1
-master-bin.000001 250 Query 1 342 use `test`; insert into t1 values (NULL)
-master-bin.000001 342 Query 1 419 use `test`; drop table t1
-master-bin.000001 419 Query 1 523 use `test`; create table t1 (word char(20) not null)
-master-bin.000001 523 Create_file 1 1193 db=test;table=t1;file_id=1;block_len=581
-master-bin.000001 1193 Exec_load 1 1216 ;file_id=1
-master-bin.000001 1216 Query 1 1293 use `test`; drop table t1
-master-bin.000001 1293 Rotate 1 1337 master-bin.000002;pos=4
+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
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 100 Server ver: VERSION, Binlog ver: 4
-master-bin.000002 100 Query 1 187 use `test`; create table t5 (a int)
-master-bin.000002 187 Query 1 264 use `test`; drop table t5
-master-bin.000002 264 Query 1 351 use `test`; create table t1 (n int)
-master-bin.000002 351 Query 1 440 use `test`; insert into t1 values (1)
-master-bin.000002 440 Query 1 517 use `test`; drop table t1
+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
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 100 Server ver: VERSION, Binlog ver: 4
-slave-bin.000001 100 Query 1 222 use `test`; create table t1(n int not null auto_increment primary key)
-slave-bin.000001 222 Intvar 1 250 INSERT_ID=1
-slave-bin.000001 250 Query 1 342 use `test`; insert into t1 values (NULL)
-slave-bin.000001 342 Query 1 419 use `test`; drop table t1
-slave-bin.000001 419 Query 1 523 use `test`; create table t1 (word char(20) not null)
-slave-bin.000001 523 Create_file 1 1202 db=test;table=t1;file_id=1;block_len=581
-slave-bin.000001 1202 Exec_load 1 1225 ;file_id=1
-slave-bin.000001 1225 Query 1 1302 use `test`; drop table t1
-slave-bin.000001 1302 Query 1 1389 use `test`; create table t5 (a int)
-slave-bin.000001 1389 Query 1 1466 use `test`; drop table t5
-slave-bin.000001 1466 Rotate 2 1509 slave-bin.000002;pos=4
+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
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 100 Server ver: VERSION, Binlog ver: 4
-slave-bin.000002 100 Query 1 187 use `test`; create table t1 (n int)
-slave-bin.000002 187 Query 1 276 use `test`; insert into t1 values (1)
-slave-bin.000002 276 Query 1 353 use `test`; drop table t1
+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
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 517 # # master-bin.000002 Yes Yes 0 0 517 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 515 # # master-bin.000002 Yes Yes 0 0 515 # 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.29/mysql-test/r/user_var.result 2005-03-21 19:24:55 +01:00
+++ 1.30/mysql-test/r/user_var.result 2005-03-22 09:32:43 +01:00
@@ -176,13 +176,13 @@
set @var1= "';aaa";
SET @var2=char(ascii('a'));
insert into t1 values (@var1),(@var2);
-show binlog events from 100;
+show binlog events from 98;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 100 User var 1 141 @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
-master-bin.000001 141 Query 1 234 use `test`; INSERT INTO t1 VALUES(@`a b`)
-master-bin.000001 234 User var 1 276 @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
-master-bin.000001 276 User var 1 314 @`var2`=_latin1 0x61 COLLATE latin1_swedish_ci
-master-bin.000001 314 Query 1 415 use `test`; insert into t1 values (@var1),(@var2)
+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`)
+master-bin.000001 # User var 1 # @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
+master-bin.000001 # User var 1 # @`var2`=_latin1 0x61 COLLATE latin1_swedish_ci
+master-bin.000001 # Query 1 # use `test`; insert into t1 values (@var1),(@var2)
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
ROLLBACK;
--- 1.18/mysql-test/r/rpl_temporary.result 2005-03-21 19:24:55 +01:00
+++ 1.19/mysql-test/r/rpl_temporary.result 2005-03-22 09:32:43 +01:00
@@ -38,19 +38,19 @@
7
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 4 Format_desc 1 100 Server ver: VERSION, Binlog ver: 4
-master-bin.000001 100 Query 1 190 use `test`; drop table if exists t1,t2
-master-bin.000001 190 Query 1 276 use `test`; create table t1(f int)
-master-bin.000001 276 Query 1 362 use `test`; create table t2(f int)
-master-bin.000001 362 Query 1 488 use `test`; insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10)
-master-bin.000001 488 Query 1 584 use `test`; create temporary table t3(f int)
-master-bin.000001 584 Query 1 689 use `test`; insert into t3 select * from t1 where f<6
-master-bin.000001 689 Query 1 785 use `test`; create temporary table t3(f int)
-master-bin.000001 785 Query 1 887 use `test`; insert into t2 select count(*) from t3
-master-bin.000001 887 Query 1 993 use `test`; insert into t3 select * from t1 where f>=4
-master-bin.000001 993 Query 1 1080 use `test`; drop temporary table t3
-master-bin.000001 1080 Query 1 1182 use `test`; insert into t2 select count(*) from t3
-master-bin.000001 1182 Query 1 1269 use `test`; drop temporary table t3
+master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
+master-bin.000001 # Query 1 # use `test`; drop table if exists t1,t2
+master-bin.000001 # Query 1 # use `test`; create table t1(f int)
+master-bin.000001 # Query 1 # use `test`; create table t2(f int)
+master-bin.000001 # Query 1 # use `test`; insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10)
+master-bin.000001 # Query 1 # use `test`; create temporary table t3(f int)
+master-bin.000001 # Query 1 # use `test`; insert into t3 select * from t1 where f<6
+master-bin.000001 # Query 1 # use `test`; create temporary table t3(f int)
+master-bin.000001 # Query 1 # use `test`; insert into t2 select count(*) from t3
+master-bin.000001 # Query 1 # use `test`; insert into t3 select * from t1 where f>=4
+master-bin.000001 # Query 1 # use `test`; drop temporary table t3
+master-bin.000001 # Query 1 # use `test`; insert into t2 select count(*) from t3
+master-bin.000001 # Query 1 # use `test`; drop temporary table t3
drop table t1, t2;
use test;
SET TIMESTAMP=1040323920;
| Thread |
|---|
| • bk commit into 5.1 tree (mats:1.1798) | Mats Kindahl | 22 Mar |
