diff options
Diffstat (limited to 'mysql-test')
41 files changed, 349 insertions, 581 deletions
diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result index fe2d76c8ab3..f310bc7ba53 100644 --- a/mysql-test/r/ctype_ucs.result +++ b/mysql-test/r/ctype_ucs.result @@ -523,104 +523,16 @@ create table t2 (c char(30)) charset=ucs2; set @v=convert('abc' using ucs2); reset master; insert into t2 values (@v); -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 User var 1 135 @`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci -master-bin.000001 135 Query 1 225 use `test`; insert into t2 values (@v) +master-bin.000001 96 User var 1 136 @`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci +master-bin.000001 136 Query 1 219 use `test`; insert into t2 values (@v) +flush logs; /*!40019 SET @@session.max_insert_delayed_threads=0*/; -SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`; +SET @`v`:=_ucs2 0x006100620063 COLLATE ucs2_general_ci; use test; SET TIMESTAMP=10000; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1; SET @@session.sql_mode=0; -SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8; insert into t2 values (@v); drop table t2; -set names latin1; -create table t1 (a enum('x','y','z') character set ucs2); -show create table t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` enum('x','y','z') character set ucs2 default NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 -insert into t1 values ('x'); -insert into t1 values ('y'); -insert into t1 values ('z'); -select a, hex(a) from t1 order by a; -a hex(a) -x 0078 -y 0079 -z 007A -alter table t1 change a a enum('x','y','z','d','e','ä','ö','ü') character set ucs2; -show create table t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` enum('x','y','z','d','e','ä','ö','ü') character set ucs2 default NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 -insert into t1 values ('D'); -insert into t1 values ('E '); -insert into t1 values ('Ä'); -insert into t1 values ('Ö'); -insert into t1 values ('Ü'); -select a, hex(a) from t1 order by a; -a hex(a) -x 0078 -y 0079 -z 007A -d 0064 -e 0065 -ä 00E4 -ö 00F6 -ü 00FC -drop table t1; -create table t1 (a set ('x','y','z','ä','ö','ü') character set ucs2); -show create table t1; -Table Create Table -t1 CREATE TABLE `t1` ( - `a` set('x','y','z','ä','ö','ü') character set ucs2 default NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 -insert into t1 values ('x'); -insert into t1 values ('y'); -insert into t1 values ('z'); -insert into t1 values ('x,y'); -insert into t1 values ('x,y,z,Ä,Ö,Ü'); -select a, hex(a) from t1 order by a; -a hex(a) -x 0078 -y 0079 -x,y 0078002C0079 -z 007A -x,y,z,ä,ö,ü 0078002C0079002C007A002C00E4002C00F6002C00FC -drop table t1; -create table t1(a enum('a','b','c')) default character set ucs2; -insert into t1 values('a'),('b'),('c'); -alter table t1 add b char(1); -show warnings; -Level Code Message -select * from t1 order by a; -a b -a NULL -b NULL -c NULL -drop table t1; -SET collation_connection='ucs2_general_ci'; -create table t1 select repeat('a',4000) a; -delete from t1; -insert into t1 values ('a'), ('a '), ('a\t'); -select collation(a),hex(a) from t1 order by a; -collation(a) hex(a) -ucs2_general_ci 00610009 -ucs2_general_ci 0061 -ucs2_general_ci 00610020 -drop table t1; -SET NAMES latin1; -SET collation_connection='ucs2_bin'; -create table t1 select repeat('a',4000) a; -delete from t1; -insert into t1 values ('a'), ('a '), ('a\t'); -select collation(a),hex(a) from t1 order by a; -collation(a) hex(a) -ucs2_bin 00610009 -ucs2_bin 0061 -ucs2_bin 00610020 -drop table t1; diff --git a/mysql-test/r/drop_temp_table.result b/mysql-test/r/drop_temp_table.result index 163fc845e88..82bbe32a042 100644 --- a/mysql-test/r/drop_temp_table.result +++ b/mysql-test/r/drop_temp_table.result @@ -1,9 +1,7 @@ reset master; create database `drop-temp+table-test`; use `drop-temp+table-test`; -create temporary table shortn1 (a int); create temporary table `table:name` (a int); -create temporary table shortn2 (a int); select get_lock("a",10); get_lock("a",10) 1 @@ -12,13 +10,9 @@ get_lock("a",10) 1 show binlog events; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4 -master-bin.000001 # Query 1 # create database `drop-temp+table-test` -master-bin.000001 # Query 1 # use `drop-temp+table-test`; create temporary table shortn1 (a int) -master-bin.000001 # Query 1 # use `drop-temp+table-test`; create temporary table `table:name` (a int) -master-bin.000001 # Query 1 # use `drop-temp+table-test`; create temporary table shortn2 (a int) -master-bin.000001 # Query 1 # use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`shortn2` -master-bin.000001 # Query 1 # use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name` -master-bin.000001 # Query 1 # use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`shortn1` -master-bin.000001 # Query 1 # use `drop-temp+table-test`; DO RELEASE_LOCK("a") +master-bin.000001 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4 +master-bin.000001 96 Query 1 207 create database `drop-temp+table-test` +master-bin.000001 207 Query 1 323 use `drop-temp+table-test`; create temporary table `table:name` (a int) +master-bin.000001 323 Query 1 474 use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name` +master-bin.000001 474 Query 1 567 use `drop-temp+table-test`; DO RELEASE_LOCK("a") drop database `drop-temp+table-test`; diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result index 5928688ca81..e7be5fc5823 100644 --- a/mysql-test/r/innodb.result +++ b/mysql-test/r/innodb.result @@ -249,30 +249,6 @@ n 4 5 6 -set autocommit=0; -begin; -savepoint `my_savepoint`; -insert into t1 values (7); -savepoint `savept2`; -insert into t1 values (3); -select n from t1; -n -3 -4 -5 -6 -7 -rollback to savepoint `savept2`; -release savepoint `my_savepoint`; -select n from t1; -n -4 -5 -6 -7 -rollback to savepoint `my_savepoint`; -ERROR HY000: Got error 153 during ROLLBACK -set autocommit=1; rollback; drop table t1; create table t1 (n int not null primary key) engine=innodb; @@ -1350,8 +1326,8 @@ truncate table t1; insert into t1 (a) values (NULL),(NULL); SELECT * from t1; a -1 -2 +3 +4 drop table t1; CREATE TABLE t1 (`id 1` INT NOT NULL, PRIMARY KEY (`id 1`)) ENGINE=INNODB; CREATE TABLE t2 (id INT PRIMARY KEY, t1_id INT, INDEX par_ind (t1_id), FOREIGN KEY (`t1_id`) REFERENCES `t1`(`id 1`) ON DELETE CASCADE ) ENGINE=INNODB; @@ -1445,19 +1421,19 @@ insert t2 select * from t1; insert t3 select * from t1; checksum table t1, t2, t3, t4 quick; Table Checksum -test.t1 2948697075 +test.t1 272226711 test.t2 NULL test.t3 NULL test.t4 NULL checksum table t1, t2, t3, t4; Table Checksum -test.t1 2948697075 +test.t1 272226711 test.t2 968604391 test.t3 968604391 test.t4 NULL checksum table t1, t2, t3, t4 extended; Table Checksum -test.t1 3092701434 +test.t1 272226711 test.t2 968604391 test.t3 968604391 test.t4 NULL @@ -1633,14 +1609,14 @@ t2 CREATE TABLE `t2` ( drop table t2, t1; show status like "binlog_cache_use"; Variable_name Value -Binlog_cache_use 25 +Binlog_cache_use 150 show status like "binlog_cache_disk_use"; Variable_name Value Binlog_cache_disk_use 0 create table t1 (a int) engine=innodb; show status like "binlog_cache_use"; Variable_name Value -Binlog_cache_use 26 +Binlog_cache_use 151 show status like "binlog_cache_disk_use"; Variable_name Value Binlog_cache_disk_use 1 @@ -1649,7 +1625,7 @@ delete from t1; commit; show status like "binlog_cache_use"; Variable_name Value -Binlog_cache_use 27 +Binlog_cache_use 152 show status like "binlog_cache_disk_use"; Variable_name Value Binlog_cache_disk_use 1 @@ -1714,90 +1690,15 @@ Variable_name Value Innodb_page_size 16384 show status like "Innodb_rows_deleted"; Variable_name Value -Innodb_rows_deleted 2070 +Innodb_rows_deleted 2078 show status like "Innodb_rows_inserted"; Variable_name Value -Innodb_rows_inserted 31708 +Innodb_rows_inserted 31706 show status like "Innodb_rows_read"; Variable_name Value -Innodb_rows_read 80162 +Innodb_rows_read 80161 show status like "Innodb_rows_updated"; Variable_name Value Innodb_rows_updated 29530 -show status like "Innodb_row_lock_waits"; -Variable_name Value -Innodb_row_lock_waits 0 -show status like "Innodb_row_lock_current_waits"; -Variable_name Value -Innodb_row_lock_current_waits 0 -show status like "Innodb_row_lock_time"; -Variable_name Value -Innodb_row_lock_time 0 -show status like "Innodb_row_lock_time_max"; -Variable_name Value -Innodb_row_lock_time_max 0 -show status like "Innodb_row_lock_time_avg"; -Variable_name Value -Innodb_row_lock_time_avg 0 -show variables like "innodb_sync_spin_loops"; -Variable_name Value -innodb_sync_spin_loops 20 -set global innodb_sync_spin_loops=1000; -show variables like "innodb_sync_spin_loops"; -Variable_name Value -innodb_sync_spin_loops 1000 -set global innodb_sync_spin_loops=0; -show variables like "innodb_sync_spin_loops"; -Variable_name Value -innodb_sync_spin_loops 0 -set global innodb_sync_spin_loops=20; -show variables like "innodb_sync_spin_loops"; -Variable_name Value -innodb_sync_spin_loops 20 -show variables like "innodb_thread_concurrency"; -Variable_name Value -innodb_thread_concurrency 8 -set global innodb_thread_concurrency=1000; -show variables like "innodb_thread_concurrency"; -Variable_name Value -innodb_thread_concurrency 1000 -set global innodb_thread_concurrency=0; -show variables like "innodb_thread_concurrency"; -Variable_name Value -innodb_thread_concurrency 1 -set global innodb_thread_concurrency=16; -show variables like "innodb_thread_concurrency"; -Variable_name Value -innodb_thread_concurrency 16 -show variables like "innodb_concurrency_tickets"; -Variable_name Value -innodb_concurrency_tickets 500 -set global innodb_concurrency_tickets=1000; -show variables like "innodb_concurrency_tickets"; -Variable_name Value -innodb_concurrency_tickets 1000 -set global innodb_concurrency_tickets=0; -show variables like "innodb_concurrency_tickets"; -Variable_name Value -innodb_concurrency_tickets 1 -set global innodb_concurrency_tickets=500; -show variables like "innodb_concurrency_tickets"; -Variable_name Value -innodb_concurrency_tickets 500 -show variables like "innodb_thread_sleep_delay"; -Variable_name Value -innodb_thread_sleep_delay 10000 -set global innodb_thread_sleep_delay=100000; -show variables like "innodb_thread_sleep_delay"; -Variable_name Value -innodb_thread_sleep_delay 100000 -set global innodb_thread_sleep_delay=0; -show variables like "innodb_thread_sleep_delay"; -Variable_name Value -innodb_thread_sleep_delay 0 -set global innodb_thread_sleep_delay=10000; -show variables like "innodb_thread_sleep_delay"; -Variable_name Value -innodb_thread_sleep_delay 10000 create table t1 (v varchar(16384)) engine=innodb; ERROR 42000: Column length too big for column 'v' (max = 255); use BLOB instead diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index 611c6f2712e..ac71ba05d58 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -74,8 +74,8 @@ insert into t1 select * from t2; 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 95 Server ver: VERSION, Binlog ver: 4 -master-bin.000001 95 Query 1 190 use `test`; insert into t1 select * from t2 +master-bin.000001 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4 +master-bin.000001 96 Query 1 184 use `test`; insert into t1 select * from t2 select * from t1; a 1 @@ -88,7 +88,7 @@ create table t2(unique(a)) select a from t1; 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 95 Server ver: VERSION, Binlog ver: 4 +master-bin.000001 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4 drop table t1; create table t1 (a int not null); create table t2 (a int not null); @@ -638,15 +638,3 @@ No Field Count 0 1 100 0 2 100 drop table t1, t2; -CREATE TABLE t1 ( -ID int(11) NOT NULL auto_increment, -NO int(11) NOT NULL default '0', -SEQ int(11) NOT NULL default '0', -PRIMARY KEY (ID), -KEY t1$NO (SEQ,NO) -) ENGINE=MyISAM; -INSERT INTO t1 (SEQ, NO) SELECT "1" AS SEQ, IF(MAX(NO) IS NULL, 0, MAX(NO)) + 1 AS NO FROM t1 WHERE (SEQ = 1); -select SQL_BUFFER_RESULT * from t1 WHERE (SEQ = 1); -ID NO SEQ -1 1 1 -drop table t1; diff --git a/mysql-test/r/mix_innodb_myisam_binlog.result b/mysql-test/r/mix_innodb_myisam_binlog.result index 96a2ac551a9..ac2b2cfbed1 100644 --- a/mysql-test/r/mix_innodb_myisam_binlog.result +++ b/mysql-test/r/mix_innodb_myisam_binlog.result @@ -6,12 +6,12 @@ begin; insert into t1 values(1); insert into t2 select * from t1; commit; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(1) -master-bin.000001 252 Query 1 # use `test`; insert into t2 select * from t1 -master-bin.000001 347 Query 1 # use `test`; COMMIT +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(1) +master-bin.000001 239 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 327 Xid 1 # COMMIT /* xid=7 */ delete from t1; delete from t2; reset master; @@ -21,12 +21,12 @@ insert into t2 select * from t1; rollback; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(2) -master-bin.000001 252 Query 1 # use `test`; insert into t2 select * from t1 -master-bin.000001 347 Query 1 # use `test`; ROLLBACK +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(2) +master-bin.000001 239 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 327 Query 1 # use `test`; ROLLBACK delete from t1; delete from t2; reset master; @@ -39,15 +39,15 @@ rollback to savepoint my_savepoint; Warnings: Warning 1196 Some non-transactional changed tables couldn't be rolled back commit; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(3) -master-bin.000001 252 Query 1 # use `test`; savepoint my_savepoint -master-bin.000001 338 Query 1 # use `test`; insert into t1 values(4) -master-bin.000001 426 Query 1 # use `test`; insert into t2 select * from t1 -master-bin.000001 521 Query 1 # use `test`; rollback to savepoint my_savepoint -master-bin.000001 619 Query 1 # use `test`; COMMIT +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(3) +master-bin.000001 239 Query 1 # use `test`; savepoint my_savepoint +master-bin.000001 318 Query 1 # use `test`; insert into t1 values(4) +master-bin.000001 399 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 487 Query 1 # use `test`; rollback to savepoint my_savepoint +master-bin.000001 578 Xid 1 # COMMIT /* xid=24 */ delete from t1; delete from t2; reset master; @@ -65,16 +65,16 @@ select a from t1 order by a; a 5 7 -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(5) -master-bin.000001 252 Query 1 # use `test`; savepoint my_savepoint -master-bin.000001 338 Query 1 # use `test`; insert into t1 values(6) -master-bin.000001 426 Query 1 # use `test`; insert into t2 select * from t1 -master-bin.000001 521 Query 1 # use `test`; rollback to savepoint my_savepoint -master-bin.000001 619 Query 1 # use `test`; insert into t1 values(7) -master-bin.000001 707 Query 1 # use `test`; COMMIT +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(5) +master-bin.000001 239 Query 1 # use `test`; savepoint my_savepoint +master-bin.000001 318 Query 1 # use `test`; insert into t1 values(6) +master-bin.000001 399 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 487 Query 1 # use `test`; rollback to savepoint my_savepoint +master-bin.000001 578 Query 1 # use `test`; insert into t1 values(7) +master-bin.000001 659 Xid 1 # COMMIT /* xid=36 */ delete from t1; delete from t2; reset master; @@ -87,40 +87,47 @@ insert into t2 select * from t1; select get_lock("a",10); get_lock("a",10) 1 -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(8) -master-bin.000001 252 Query 1 # use `test`; insert into t2 select * from t1 -master-bin.000001 347 Query 1 # use `test`; ROLLBACK +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(8) +master-bin.000001 239 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 327 Query 1 # use `test`; ROLLBACK +master-bin.000001 392 Query 1 # use `test`; DO RELEASE_LOCK("a") delete from t1; delete from t2; reset master; insert into t1 values(9); insert into t2 select * from t1; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; insert into t1 values(9) -master-bin.000001 183 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(9) +master-bin.000001 239 Xid 1 # COMMIT /* xid=59 */ +master-bin.000001 266 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 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; insert into t1 values(10) -master-bin.000001 184 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(10) +master-bin.000001 240 Xid 1 # COMMIT /* xid=65 */ +master-bin.000001 267 Query 1 # use `test`; insert into t2 select * from t1 insert into t1 values(11); commit; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; insert into t1 values(10) -master-bin.000001 184 Query 1 # use `test`; insert into t2 select * from t1 -master-bin.000001 279 Query 1 # use `test`; BEGIN -master-bin.000001 348 Query 1 # use `test`; insert into t1 values(11) -master-bin.000001 437 Query 1 # use `test`; COMMIT +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(10) +master-bin.000001 240 Xid 1 # COMMIT /* xid=65 */ +master-bin.000001 267 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 355 Query 1 # use `test`; BEGIN +master-bin.000001 417 Query 1 # use `test`; insert into t1 values(11) +master-bin.000001 499 Xid 1 # COMMIT /* xid=67 */ alter table t2 engine=INNODB; delete from t1; delete from t2; @@ -129,12 +136,12 @@ begin; insert into t1 values(12); insert into t2 select * from t1; commit; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(12) -master-bin.000001 253 Query 1 # use `test`; insert into t2 select * from t1 -master-bin.000001 348 Query 1 # use `test`; COMMIT +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(12) +master-bin.000001 240 Query 1 # use `test`; insert into t2 select * from t1 +master-bin.000001 328 Xid 1 # COMMIT /* xid=77 */ delete from t1; delete from t2; reset master; @@ -142,7 +149,7 @@ begin; insert into t1 values(13); insert into t2 select * from t1; rollback; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info delete from t1; delete from t2; @@ -154,11 +161,11 @@ insert into t1 values(15); insert into t2 select * from t1; rollback to savepoint my_savepoint; commit; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(14) -master-bin.000001 253 Query 1 # use `test`; COMMIT +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(14) +master-bin.000001 240 Xid 1 # COMMIT /* xid=93 */ delete from t1; delete from t2; reset master; @@ -174,12 +181,12 @@ select a from t1 order by a; a 16 18 -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 # use `test`; BEGIN -master-bin.000001 164 Query 1 # use `test`; insert into t1 values(16) -master-bin.000001 253 Query 1 # use `test`; insert into t1 values(18) -master-bin.000001 342 Query 1 # use `test`; COMMIT +master-bin.000001 96 Query 1 # use `test`; BEGIN +master-bin.000001 158 Query 1 # use `test`; insert into t1 values(16) +master-bin.000001 240 Query 1 # use `test`; insert into t1 values(18) +master-bin.000001 322 Xid 1 # COMMIT /* xid=104 */ delete from t1; delete from t2; alter table t2 type=MyISAM; diff --git a/mysql-test/r/mysqlbinlog2.result b/mysql-test/r/mysqlbinlog2.result index 805c25be086..fd4279e65a8 100644 --- a/mysql-test/r/mysqlbinlog2.result +++ b/mysql-test/r/mysqlbinlog2.result @@ -152,6 +152,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq SET @@session.sql_mode=0; SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8; insert into t1 values(null, "f"); +ROLLBACK; --- offset -- /*!40019 SET @@session.max_insert_delayed_threads=0*/; @@ -181,6 +182,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq SET @@session.sql_mode=0; SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8; insert into t1 values(null, "f"); +ROLLBACK; --- start-position -- /*!40019 SET @@session.max_insert_delayed_threads=0*/; @@ -201,6 +203,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq SET @@session.sql_mode=0; SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8; insert into t1 values(null, "f"); +ROLLBACK; --- stop-position -- /*!40019 SET @@session.max_insert_delayed_threads=0*/; @@ -249,6 +252,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq SET @@session.sql_mode=0; SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8; insert into t1 values(null, "f"); +ROLLBACK; --- stop-datetime -- /*!40019 SET @@session.max_insert_delayed_threads=0*/; diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result index 38544c0aed7..44d3a844c74 100644 --- a/mysql-test/r/rpl000015.result +++ b/mysql-test/r/rpl000015.result @@ -1,7 +1,7 @@ reset master; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 95 +master-bin.000001 96 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 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File 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 95 # # master-bin.000001 Yes Yes 0 0 95 # None 0 No # +# 127.0.0.1 root MASTER_PORT 7 master-bin.000001 96 # # master-bin.000001 Yes Yes 0 0 96 # None 0 No # drop table if exists t1; create table t1 (n int); insert into t1 values (10),(45),(90); diff --git a/mysql-test/r/rpl_change_master.result b/mysql-test/r/rpl_change_master.result index 5fbf4cc3318..a81dc70b39b 100644 --- a/mysql-test/r/rpl_change_master.result +++ b/mysql-test/r/rpl_change_master.result @@ -16,11 +16,11 @@ n 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_MYPORT 1 master-bin.000001 376 # # master-bin.000001 No No 0 0 288 # None 0 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 356 # # master-bin.000001 No No 0 0 275 # 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 288 # # master-bin.000001 No No 0 0 288 # None 0 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 275 # # master-bin.000001 No No 0 0 275 # None 0 No # select release_lock("a"); release_lock("a") 1 diff --git a/mysql-test/r/rpl_charset.result b/mysql-test/r/rpl_charset.result index 6b8a2ac70de..e26bb05431a 100644 --- a/mysql-test/r/rpl_charset.result +++ b/mysql-test/r/rpl_charset.result @@ -4,7 +4,6 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -set timestamp=1000000000; drop database if exists mysqltest2; drop database if exists mysqltest3; create database mysqltest2 character set latin2; @@ -88,6 +87,7 @@ a b 2 Muffler 3 latin1_german2_ci 4 Müller +load data infile '../../std_data/words.dat' into table t1 (b); set @a= _cp850 'Müller' collate cp850_general_ci; truncate table t1; insert into t1 (b) values(collation(@a)); @@ -103,44 +103,68 @@ a b 1 cp850_general_ci drop database mysqltest2; drop database mysqltest3; -show binlog events from 95; +show binlog events from 96; 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 master-bin.000001 # Query 1 # create database mysqltest2 character set latin2 +master-bin.000001 # Query 1 # use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=30 master-bin.000001 # Query 1 # create database mysqltest3 +master-bin.000001 # Query 1 # use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=64 master-bin.000001 # Query 1 # drop database mysqltest3 +master-bin.000001 # Query 1 # use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=64 master-bin.000001 # Query 1 # create database mysqltest3 +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=9,COLLATION_SERVER=64 master-bin.000001 # Query 1 # use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100)) +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64 master-bin.000001 # Intvar 1 # INSERT_ID=1 master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(@@character_set_server) +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64 master-bin.000001 # Intvar 1 # INSERT_ID=2 master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(@@collation_server) +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64 master-bin.000001 # Intvar 1 # INSERT_ID=3 master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(@@character_set_client) +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64 master-bin.000001 # Intvar 1 # INSERT_ID=4 master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(@@character_set_connection) +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64 master-bin.000001 # Intvar 1 # INSERT_ID=5 master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(@@collation_connection) +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=5,COLLATION_DATABASE=9,COLLATION_SERVER=64 master-bin.000001 # Query 1 # use `mysqltest2`; truncate table t1 +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=5,COLLATION_DATABASE=9,COLLATION_SERVER=64 master-bin.000001 # Intvar 1 # INSERT_ID=1 master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(@@collation_connection) +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=5,COLLATION_DATABASE=9,COLLATION_SERVER=64 master-bin.000001 # Intvar 1 # INSERT_ID=2 master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(LEAST("Müller","Muffler")) +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64 master-bin.000001 # Intvar 1 # INSERT_ID=3 master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(@@collation_connection) +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64 master-bin.000001 # Intvar 1 # INSERT_ID=4 master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(LEAST("Müller","Muffler")) +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64 +master-bin.000001 # Intvar 1 # INSERT_ID=74 +master-bin.000001 # Create_file 1 # db=mysqltest2;table=t1;file_id=1;block_len=581 +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64 +master-bin.000001 # Intvar 1 # INSERT_ID=5 +master-bin.000001 # Exec_load 1 # ;file_id=1 +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64 master-bin.000001 # Query 1 # use `mysqltest2`; truncate table t1 +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64 master-bin.000001 # Intvar 1 # INSERT_ID=1 master-bin.000001 # User var 1 # @`a`=_cp850 0x4DFC6C6C6572 COLLATE cp850_general_ci master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(collation(@a)) +master-bin.000001 # Query 1 # use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64 master-bin.000001 # Query 1 # drop database mysqltest2 +master-bin.000001 # Query 1 # SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64 master-bin.000001 # Query 1 # drop database mysqltest3 set global character_set_server=latin2; -set global character_set_server=latin1; +ERROR HY000: Binary logging and replication forbid changing the global server character set, collation set global character_set_server=latin2; -set global character_set_server=latin1; +ERROR HY000: Binary logging and replication forbid changing the global server character set, collation set one_shot @@character_set_server=latin5; set @@max_join_size=1000; select @@character_set_server; @@ -174,74 +198,12 @@ CDF32C20E7E020F0FBE1E0EBEAF3 CDF32C20E7E020F0FBE1E0EBEAF3 select hex(c1), hex(c2) from t1; hex(c1) hex(c2) CDF32C20E7E020F0FBE1E0EBEAF3 CDF32C20E7E020F0FBE1E0EBEAF3 -/*!40019 SET @@session.max_insert_delayed_threads=0*/; -SET TIMESTAMP=1000000000; -SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1; -SET @@session.sql_mode=0; -SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8; -drop database if exists mysqltest2; -SET TIMESTAMP=1000000000; -drop database if exists mysqltest3; -SET TIMESTAMP=1000000000; -create database mysqltest2 character set latin2; -SET TIMESTAMP=1000000000; -SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=30; -create database mysqltest3; -SET TIMESTAMP=1000000000; -SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=64; -drop database mysqltest3; -SET TIMESTAMP=1000000000; -create database mysqltest3; -use mysqltest2; -SET TIMESTAMP=1000000000; -create table t1 (a int auto_increment primary key, b varchar(100)); -SET INSERT_ID=1; -SET TIMESTAMP=1000000000; -SET @@session.character_set_client=4,@@session.collation_connection=27,@@session.collation_server=64; -insert into t1 (b) values(@@character_set_server); -SET INSERT_ID=2; -SET TIMESTAMP=1000000000; -insert into t1 (b) values(@@collation_server); -SET INSERT_ID=3; -SET TIMESTAMP=1000000000; -insert into t1 (b) values(@@character_set_client); -SET INSERT_ID=4; -SET TIMESTAMP=1000000000; -insert into t1 (b) values(@@character_set_connection); -SET INSERT_ID=5; -SET TIMESTAMP=1000000000; -insert into t1 (b) values(@@collation_connection); -SET TIMESTAMP=1000000000; -SET @@session.character_set_client=8,@@session.collation_connection=5,@@session.collation_server=64; -truncate table t1; -SET INSERT_ID=1; -SET TIMESTAMP=1000000000; -insert into t1 (b) values(@@collation_connection); -SET INSERT_ID=2; -SET TIMESTAMP=1000000000; -insert into t1 (b) values(LEAST("Müller","Muffler")); -SET INSERT_ID=3; -SET TIMESTAMP=1000000000; -SET @@session.character_set_client=8,@@session.collation_connection=31,@@session.collation_server=64; -insert into t1 (b) values(@@collation_connection); -SET INSERT_ID=4; -SET TIMESTAMP=1000000000; -insert into t1 (b) values(LEAST("Müller","Muffler")); -SET TIMESTAMP=1000000000; -truncate table t1; -SET INSERT_ID=1; -SET @`a`:=_cp850 0x4DFC6C6C6572 COLLATE `cp850_general_ci`; -SET TIMESTAMP=1000000000; -insert into t1 (b) values(collation(@a)); -SET TIMESTAMP=1000000000; -drop database mysqltest2; -SET TIMESTAMP=1000000000; -drop database mysqltest3; -use test; -SET TIMESTAMP=1000000000; -SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=30; -CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255)); -SET TIMESTAMP=1000000000; -SET @@session.character_set_client=7,@@session.collation_connection=51,@@session.collation_server=30; -INSERT INTO t1 (c1, c2) VALUES ('îÕ, ÚÁ ÒÙÂÁÌËÕ','îÕ, ÚÁ ÒÙÂÁÌËÕ'); +stop slave; +delete from t1; +change master to master_log_pos=6810; +start slave until master_log_file='master-bin.000001', master_log_pos=6968; +start slave; +select hex(c1), hex(c2) from t1; +hex(c1) hex(c2) +CDF32C20E7E020F0FBE1E0EBEAF3 CDF32C20E7E020F0FBE1E0EBEAF3 drop table t1; diff --git a/mysql-test/r/rpl_error_ignored_table.result b/mysql-test/r/rpl_error_ignored_table.result index 917fe103b43..394da5bdc3f 100644 --- a/mysql-test/r/rpl_error_ignored_table.result +++ b/mysql-test/r/rpl_error_ignored_table.result @@ -9,7 +9,7 @@ insert into t1 values (1),(1); 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 287 # # master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 287 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 274 # # master-bin.000001 Yes Yes test.t3,test.t1,test.t2 0 0 274 # None 0 No # show tables like 't1'; Tables_in_test (t1) drop table t1; @@ -26,14 +26,14 @@ select (@id := id) - id from t3; 0 kill @id; drop table t2,t3; -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 194 use `test`; create table t1 (a int primary key) -master-bin.000001 194 Query 1 287 use `test`; insert into t1 values (1),(1) -master-bin.000001 287 Query 1 364 use `test`; drop table t1 -master-bin.000001 364 Query 1 463 use `test`; create table t2 (a int primary key) -master-bin.000001 463 Query 1 551 use `test`; insert into t2 values(1) -master-bin.000001 551 Query 1 639 use `test`; create table t3 (id int) -master-bin.000001 639 Query 1 741 use `test`; insert into t3 values(connection_id()) -master-bin.000001 741 Query 1 861 use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10) -master-bin.000001 861 Query 1 941 use `test`; drop table t2,t3 +master-bin.000001 96 Query 1 188 use `test`; create table t1 (a int primary key) +master-bin.000001 188 Query 1 274 use `test`; insert into t1 values (1),(1) +master-bin.000001 274 Query 1 344 use `test`; drop table t1 +master-bin.000001 344 Query 1 436 use `test`; create table t2 (a int primary key) +master-bin.000001 436 Query 1 517 use `test`; insert into t2 values(1) +master-bin.000001 517 Query 1 598 use `test`; create table t3 (id int) +master-bin.000001 598 Query 1 693 use `test`; insert into t3 values(connection_id()) +master-bin.000001 693 Query 1 806 use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10) +master-bin.000001 806 Query 1 879 use `test`; drop table t2,t3 diff --git a/mysql-test/r/rpl_flush_log_loop.result b/mysql-test/r/rpl_flush_log_loop.result index c57f6877516..f3d1c59ae95 100644 --- a/mysql-test/r/rpl_flush_log_loop.result +++ b/mysql-test/r/rpl_flush_log_loop.result @@ -14,4 +14,4 @@ start slave; 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 206 # # slave-bin.000001 Yes Yes 0 0 206 # None 0 No # +# 127.0.0.1 root SLAVE_PORT 60 slave-bin.000001 200 # # slave-bin.000001 Yes Yes 0 0 200 # None 0 No # diff --git a/mysql-test/r/rpl_flush_tables.result b/mysql-test/r/rpl_flush_tables.result index 241aada0e40..74b6b372e8c 100644 --- a/mysql-test/r/rpl_flush_tables.result +++ b/mysql-test/r/rpl_flush_tables.result @@ -14,27 +14,27 @@ rename table t1 to t5, t2 to t1; 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 95 Server ver: SERVER_VERSION, Binlog ver: 4 -master-bin.000001 95 Query 1 182 use `test`; create table t1 (a int) -master-bin.000001 182 Query 1 272 use `test`; insert into t1 values (10) -master-bin.000001 272 Query 1 359 use `test`; create table t2 (a int) -master-bin.000001 359 Query 1 469 use `test`; create table t3 (a int) engine=merge union(t1) -master-bin.000001 469 Query 1 556 use `test`; create table t4 (a int) -master-bin.000001 556 Query 1 651 use `test`; insert into t4 select * from t3 -master-bin.000001 651 Query 1 746 use `test`; rename table t1 to t5, t2 to t1 +master-bin.000001 4 Format_desc 1 96 Server ver: SERVER_VERSION, Binlog ver: 4 +master-bin.000001 96 Query 1 176 use `test`; create table t1 (a int) +master-bin.000001 176 Query 1 259 use `test`; insert into t1 values (10) +master-bin.000001 259 Query 1 339 use `test`; create table t2 (a int) +master-bin.000001 339 Query 1 442 use `test`; create table t3 (a int) engine=merge union(t1) +master-bin.000001 442 Query 1 522 use `test`; create table t4 (a int) +master-bin.000001 522 Query 1 610 use `test`; insert into t4 select * from t3 +master-bin.000001 610 Query 1 698 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 95 Server ver: SERVER_VERSION, Binlog ver: 4 -master-bin.000001 95 Query 1 182 use `test`; create table t1 (a int) -master-bin.000001 182 Query 1 272 use `test`; insert into t1 values (10) -master-bin.000001 272 Query 1 359 use `test`; create table t2 (a int) -master-bin.000001 359 Query 1 469 use `test`; create table t3 (a int) engine=merge union(t1) -master-bin.000001 469 Query 1 556 use `test`; create table t4 (a int) -master-bin.000001 556 Query 1 651 use `test`; insert into t4 select * from t3 -master-bin.000001 651 Query 1 746 use `test`; rename table t1 to t5, t2 to t1 -master-bin.000001 746 Query 1 822 use `test`; flush tables +master-bin.000001 4 Format_desc 1 96 Server ver: SERVER_VERSION, Binlog ver: 4 +master-bin.000001 96 Query 1 176 use `test`; create table t1 (a int) +master-bin.000001 176 Query 1 259 use `test`; insert into t1 values (10) +master-bin.000001 259 Query 1 339 use `test`; create table t2 (a int) +master-bin.000001 339 Query 1 442 use `test`; create table t3 (a int) engine=merge union(t1) +master-bin.000001 442 Query 1 522 use `test`; create table t4 (a int) +master-bin.000001 522 Query 1 610 use `test`; insert into t4 select * from t3 +master-bin.000001 610 Query 1 698 use `test`; rename table t1 to t5, t2 to t1 +master-bin.000001 698 Query 1 767 use `test`; flush tables select * from t3; a diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result index ccf77083362..8ccdfdf2e9e 100644 --- a/mysql-test/r/rpl_loaddata.result +++ b/mysql-test/r/rpl_loaddata.result @@ -22,7 +22,7 @@ day id category name 2003-03-22 2416 a bbbbb show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -slave-bin.000001 1096 +slave-bin.000001 1069 drop table t1; drop table t2; drop table t3; @@ -33,7 +33,7 @@ set global sql_slave_skip_counter=1; 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 1559 # # master-bin.000001 Yes Yes 0 0 1559 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1504 # # master-bin.000001 Yes Yes 0 0 1504 # 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='test'; 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 1667 # # master-bin.000001 No No 0 0 1667 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1612 # # master-bin.000001 No No 0 0 1612 # None 0 No # set global sql_slave_skip_counter=1; start slave; set sql_log_bin=0; @@ -64,5 +64,5 @@ terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by ERROR 23000: Duplicate entry '2003-03-22' for key 1 show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 536 +master-bin.000001 530 drop table t2; diff --git a/mysql-test/r/rpl_loaddata_rule_m.result b/mysql-test/r/rpl_loaddata_rule_m.result index 973f7eb6abc..f7fc223f567 100644 --- a/mysql-test/r/rpl_loaddata_rule_m.result +++ b/mysql-test/r/rpl_loaddata_rule_m.result @@ -10,8 +10,8 @@ create database mysqltest; 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 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 197 drop database if exists mysqltest -master-bin.000001 197 Query 1 291 create database mysqltest +master-bin.000001 96 Query 1 191 drop database if exists mysqltest +master-bin.000001 191 Query 1 278 create database mysqltest drop database mysqltest; diff --git a/mysql-test/r/rpl_loaddata_rule_s.result b/mysql-test/r/rpl_loaddata_rule_s.result index d7a24410f9c..6cd91ea5bf5 100644 --- a/mysql-test/r/rpl_loaddata_rule_s.result +++ b/mysql-test/r/rpl_loaddata_rule_s.result @@ -10,5 +10,5 @@ load data infile '../../std_data/rpl_loaddata.dat' into table test.t1; select count(*) from t1; count(*) 2 -show binlog events from 95; +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index f3827ad5c32..2d787676d6d 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -19,25 +19,25 @@ count(*) drop table t1; show binlog events; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 95 Server ver: VERSION, Binlog ver: 4 -master-bin.000001 95 Query 1 217 use `test`; create table t1(n int not null auto_increment primary key) -master-bin.000001 217 Intvar 1 245 INSERT_ID=1 -master-bin.000001 245 Query 1 337 use `test`; insert into t1 values (NULL) -master-bin.000001 337 Query 1 414 use `test`; drop table t1 -master-bin.000001 414 Query 1 518 use `test`; create table t1 (word char(20) not null) -master-bin.000001 518 Create_file 1 1188 db=test;table=t1;file_id=1;block_len=581 -master-bin.000001 1188 Exec_load 1 1211 ;file_id=1 -master-bin.000001 1211 Query 1 1288 use `test`; drop table t1 -show binlog events from 95 limit 1; +master-bin.000001 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4 +master-bin.000001 96 Query 1 211 use `test`; create table t1(n int not null auto_increment primary key) +master-bin.000001 211 Intvar 1 239 INSERT_ID=1 +master-bin.000001 239 Query 1 324 use `test`; insert into t1 values (NULL) +master-bin.000001 324 Query 1 394 use `test`; drop table t1 +master-bin.000001 394 Query 1 491 use `test`; create table t1 (word char(20) not null) +master-bin.000001 491 Create_file 1 1161 db=test;table=t1;file_id=1;block_len=581 +master-bin.000001 1161 Exec_load 1 1184 ;file_id=1 +master-bin.000001 1184 Query 1 1254 use `test`; drop table t1 +show binlog events from 96 limit 1; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 217 use `test`; create table t1(n int not null auto_increment primary key) -show binlog events from 95 limit 2; +master-bin.000001 96 Query 1 211 use `test`; create table t1(n int not null auto_increment primary key) +show binlog events from 96 limit 2; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 Query 1 217 use `test`; create table t1(n int not null auto_increment primary key) -master-bin.000001 217 Intvar 1 245 INSERT_ID=1 -show binlog events from 95 limit 2,1; +master-bin.000001 96 Query 1 211 use `test`; create table t1(n int not null auto_increment primary key) +master-bin.000001 211 Intvar 1 239 INSERT_ID=1 +show binlog events from 96 limit 2,1; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 245 Query 1 337 use `test`; insert into t1 values (NULL) +master-bin.000001 239 Query 1 324 use `test`; insert into t1 values (NULL) flush logs; create table t5 (a int); drop table t5; @@ -49,24 +49,24 @@ insert into t1 values (1); drop table t1; show binlog events; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 95 Server ver: VERSION, Binlog ver: 4 -master-bin.000001 95 Query 1 217 use `test`; create table t1(n int not null auto_increment primary key) -master-bin.000001 217 Intvar 1 245 INSERT_ID=1 -master-bin.000001 245 Query 1 337 use `test`; insert into t1 values (NULL) -master-bin.000001 337 Query 1 414 use `test`; drop table t1 -master-bin.000001 414 Query 1 518 use `test`; create table t1 (word char(20) not null) -master-bin.000001 518 Create_file 1 1188 db=test;table=t1;file_id=1;block_len=581 -master-bin.000001 1188 Exec_load 1 1211 ;file_id=1 -master-bin.000001 1211 Query 1 1288 use `test`; drop table t1 -master-bin.000001 1288 Rotate 1 1332 master-bin.000002;pos=4 +master-bin.000001 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4 +master-bin.000001 96 Query 1 211 use `test`; create table t1(n int not null auto_increment primary key) +master-bin.000001 211 Intvar 1 239 INSERT_ID=1 +master-bin.000001 239 Query 1 324 use `test`; insert into t1 values (NULL) +master-bin.000001 324 Query 1 394 use `test`; drop table t1 +master-bin.000001 394 Query 1 491 use `test`; create table t1 (word char(20) not null) +master-bin.000001 491 Create_file 1 1161 db=test;table=t1;file_id=1;block_len=581 +master-bin.000001 1161 Exec_load 1 1184 ;file_id=1 +master-bin.000001 1184 Query 1 1254 use `test`; drop table t1 +master-bin.000001 1254 Rotate 1 1298 master-bin.000002;pos=4 show binlog events in 'master-bin.000002'; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000002 4 Format_desc 1 95 Server ver: VERSION, Binlog ver: 4 -master-bin.000002 95 Query 1 182 use `test`; create table t5 (a int) -master-bin.000002 182 Query 1 259 use `test`; drop table t5 -master-bin.000002 259 Query 1 346 use `test`; create table t1 (n int) -master-bin.000002 346 Query 1 435 use `test`; insert into t1 values (1) -master-bin.000002 435 Query 1 512 use `test`; drop table t1 +master-bin.000002 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4 +master-bin.000002 96 Query 1 176 use `test`; create table t5 (a int) +master-bin.000002 176 Query 1 246 use `test`; drop table t5 +master-bin.000002 246 Query 1 326 use `test`; create table t1 (n int) +master-bin.000002 326 Query 1 408 use `test`; insert into t1 values (1) +master-bin.000002 408 Query 1 478 use `test`; drop table t1 show binary logs; Log_name master-bin.000001 @@ -78,26 +78,26 @@ slave-bin.000001 slave-bin.000002 show binlog events in 'slave-bin.000001' from 4; Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000001 4 Format_desc 2 95 Server ver: VERSION, Binlog ver: 4 -slave-bin.000001 95 Query 1 217 use `test`; create table t1(n int not null auto_increment primary key) -slave-bin.000001 217 Intvar 1 245 INSERT_ID=1 -slave-bin.000001 245 Query 1 337 use `test`; insert into t1 values (NULL) -slave-bin.000001 337 Query 1 414 use `test`; drop table t1 -slave-bin.000001 414 Query 1 518 use `test`; create table t1 (word char(20) not null) -slave-bin.000001 518 Create_file 1 1197 db=test;table=t1;file_id=1;block_len=581 -slave-bin.000001 1197 Exec_load 1 1220 ;file_id=1 -slave-bin.000001 1220 Query 1 1297 use `test`; drop table t1 -slave-bin.000001 1297 Query 1 1384 use `test`; create table t5 (a int) -slave-bin.000001 1384 Query 1 1461 use `test`; drop table t5 -slave-bin.000001 1461 Rotate 2 1504 slave-bin.000002;pos=4 +slave-bin.000001 4 Format_desc 2 96 Server ver: VERSION, Binlog ver: 4 +slave-bin.000001 96 Query 1 211 use `test`; create table t1(n int not null auto_increment primary key) +slave-bin.000001 211 Intvar 1 239 INSERT_ID=1 +slave-bin.000001 239 Query 1 324 use `test`; insert into t1 values (NULL) +slave-bin.000001 324 Query 1 394 use `test`; drop table t1 +slave-bin.000001 394 Query 1 491 use `test`; create table t1 (word char(20) not null) +slave-bin.000001 491 Create_file 1 1170 db=test;table=t1;file_id=1;block_len=581 +slave-bin.000001 1170 Exec_load 1 1193 ;file_id=1 +slave-bin.000001 1193 Query 1 1263 use `test`; drop table t1 +slave-bin.000001 1263 Query 1 1343 use `test`; create table t5 (a int) +slave-bin.000001 1343 Query 1 1413 use `test`; drop table t5 +slave-bin.000001 1413 Rotate 2 1456 slave-bin.000002;pos=4 show binlog events in 'slave-bin.000002' from 4; Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000002 4 Format_desc 2 95 Server ver: VERSION, Binlog ver: 4 -slave-bin.000002 95 Query 1 182 use `test`; create table t1 (n int) -slave-bin.000002 182 Query 1 271 use `test`; insert into t1 values (1) -slave-bin.000002 271 Query 1 348 use `test`; drop table t1 +slave-bin.000002 4 Format_desc 2 96 Server ver: VERSION, Binlog ver: 4 +slave-bin.000002 96 Query 1 176 use `test`; create table t1 (n int) +slave-bin.000002 176 Query 1 258 use `test`; insert into t1 values (1) +slave-bin.000002 258 Query 1 328 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 512 # # master-bin.000002 Yes Yes 0 0 512 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 478 # # master-bin.000002 Yes Yes 0 0 478 # 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 diff --git a/mysql-test/r/rpl_log_pos.result b/mysql-test/r/rpl_log_pos.result index 6ea07cf7173..60262c5e227 100644 --- a/mysql-test/r/rpl_log_pos.result +++ b/mysql-test/r/rpl_log_pos.result @@ -6,10 +6,10 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000001 95 +master-bin.000001 96 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 95 # # master-bin.000001 Yes Yes 0 0 95 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 96 # # master-bin.000001 Yes Yes 0 0 96 # None 0 No # stop slave; change master to master_log_pos=73; start slave; @@ -30,13 +30,13 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File # 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 95 +master-bin.000001 96 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=95; +change master to master_log_pos=96; start slave; select * from t1; n diff --git a/mysql-test/r/rpl_max_relay_size.result b/mysql-test/r/rpl_max_relay_size.result index c1f8b0ad889..0bb254f8320 100644 --- a/mysql-test/r/rpl_max_relay_size.result +++ b/mysql-test/r/rpl_max_relay_size.result @@ -16,7 +16,7 @@ select @@global.max_relay_log_size; 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 73751 # # master-bin.000001 Yes Yes 0 0 73751 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 68138 # # master-bin.000001 Yes Yes 0 0 68138 # None 0 No # stop slave; reset slave; set global max_relay_log_size=(5*4096); @@ -26,7 +26,7 @@ select @@global.max_relay_log_size; 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 73751 # # master-bin.000001 Yes Yes 0 0 73751 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 68138 # # master-bin.000001 Yes Yes 0 0 68138 # None 0 No # stop slave; reset slave; set global max_relay_log_size=0; @@ -36,7 +36,7 @@ select @@global.max_relay_log_size; 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 73751 # # master-bin.000001 Yes Yes 0 0 73751 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 68138 # # master-bin.000001 Yes Yes 0 0 68138 # None 0 No # stop slave; reset slave; flush logs; @@ -49,13 +49,13 @@ flush logs; 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 73838 # # master-bin.000001 Yes Yes 0 0 73838 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 68218 # # master-bin.000001 Yes Yes 0 0 68218 # 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 73915 # # master-bin.000001 Yes Yes 0 0 73915 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 68288 # # master-bin.000001 Yes Yes 0 0 68288 # None 0 No # flush logs; show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000002 95 +master-bin.000002 96 diff --git a/mysql-test/r/rpl_relayrotate.result b/mysql-test/r/rpl_relayrotate.result index 38a5a634dd6..310abe6ade3 100644 --- a/mysql-test/r/rpl_relayrotate.result +++ b/mysql-test/r/rpl_relayrotate.result @@ -18,5 +18,5 @@ max(a) 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 743228 # # master-bin.000001 Yes Yes 0 0 743228 # None 0 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 687172 # # master-bin.000001 Yes Yes 0 0 687172 # None 0 No # drop table t1; diff --git a/mysql-test/r/rpl_replicate_do.result b/mysql-test/r/rpl_replicate_do.result index df75433e84e..d5dfac85c83 100644 --- a/mysql-test/r/rpl_replicate_do.result +++ b/mysql-test/r/rpl_replicate_do.result @@ -28,4 +28,4 @@ ERROR 42S02: Table 'test.t11' doesn't exist 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 1617 # # master-bin.000001 Yes Yes test.t1 0 0 1617 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1555 # # master-bin.000001 Yes Yes test.t1 0 0 1555 # None 0 No # diff --git a/mysql-test/r/rpl_reset_slave.result b/mysql-test/r/rpl_reset_slave.result index 6161f2112db..82e518c355c 100644 --- a/mysql-test/r/rpl_reset_slave.result +++ b/mysql-test/r/rpl_reset_slave.result @@ -6,12 +6,12 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; 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 95 # # master-bin.000001 Yes Yes 0 0 95 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 96 # # master-bin.000001 Yes Yes 0 0 96 # 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 95 # # master-bin.000001 No No 0 0 95 # None 0 No # +# 127.0.0.1 test MASTER_PORT 1 master-bin.000001 96 # # master-bin.000001 No No 0 0 96 # 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 @@ Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File 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 95 # # master-bin.000001 Yes Yes 0 0 95 # None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 96 # # master-bin.000001 Yes Yes 0 0 96 # None 0 No # stop slave; reset slave; start slave; diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result index e675f8177ab..e4bd6fb7209 100644 --- a/mysql-test/r/rpl_rotate_logs.result +++ b/mysql-test/r/rpl_rotate_logs.result @@ -1,7 +1,7 @@ drop table if exists t1, t2, t3, t4; drop table if exists t1, t2, t3, t4; start slave; -Got one of the listed errors +ERROR HY000: File 'TESTDIR/var/slave-data/master.info' not found (Errcode: 13) start slave; ERROR HY000: Could not initialize master info structure; more error messages can be found in the MySQL error log change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root'; @@ -16,7 +16,7 @@ create table t1 (s text); 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 549 # # master-bin.000001 Yes Yes 0 0 549 # None 0 No # +# 127.0.0.1 root MASTER_PORT 60 master-bin.000001 522 # # master-bin.000001 Yes Yes 0 0 522 # None 0 No # select * from t1; s Could not break slave @@ -57,7 +57,7 @@ master-bin.000003 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 497 # # master-bin.000003 Yes Yes 0 0 497 # None 0 No # +# 127.0.0.1 root MASTER_PORT 60 master-bin.000003 470 # # master-bin.000003 Yes Yes 0 0 470 # None 0 No # select * from t2; m 34 @@ -79,13 +79,13 @@ master-bin.000004 master-bin.000005 show master status; File Position Binlog_Do_DB Binlog_Ignore_DB -master-bin.000005 2050 +master-bin.000005 1388 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 2050 # # master-bin.000005 Yes Yes 0 0 2050 # None 0 No # +# 127.0.0.1 root MASTER_PORT 60 master-bin.000005 1388 # # master-bin.000005 Yes Yes 0 0 1388 # None 0 No # lock tables t3 read; select count(*) from t3 where n >= 4; count(*) diff --git a/mysql-test/r/rpl_server_id1.result b/mysql-test/r/rpl_server_id1.result index ed24c0ef35b..fd8d73d5444 100644 --- a/mysql-test/r/rpl_server_id1.result +++ b/mysql-test/r/rpl_server_id1.result @@ -10,7 +10,7 @@ stop slave; 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 95 None 0 No NULL + 127.0.0.1 root SLAVE_PORT 1 4 slave-relay-bin.000001 4 No No # 0 0 0 96 None 0 No NULL start slave; insert into t1 values (1); show status like "slave_running"; diff --git a/mysql-test/r/rpl_server_id2.result b/mysql-test/r/rpl_server_id2.result index 36a142166fa..7ca88521b22 100644 --- a/mysql-test/r/rpl_server_id2.result +++ b/mysql-test/r/rpl_server_id2.result @@ -10,7 +10,7 @@ stop slave; 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 95 None 0 No NULL + 127.0.0.1 root SLAVE_PORT 1 4 slave-relay-bin.000001 4 No No # 0 0 0 96 None 0 No NULL start slave; insert into t1 values (1); select * from t1; diff --git a/mysql-test/r/rpl_temporary.result b/mysql-test/r/rpl_temporary.result index 7d3ebd4ad32..55a4207ad82 100644 --- a/mysql-test/r/rpl_temporary.result +++ b/mysql-test/r/rpl_temporary.result @@ -38,19 +38,19 @@ f 7 show binlog events; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 95 Server ver: VERSION, Binlog ver: 4 -master-bin.000001 95 Query 1 185 use `test`; drop table if exists t1,t2 -master-bin.000001 185 Query 1 271 use `test`; create table t1(f int) -master-bin.000001 271 Query 1 357 use `test`; create table t2(f int) -master-bin.000001 357 Query 1 483 use `test`; insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10) -master-bin.000001 483 Query 1 579 use `test`; create temporary table t3(f int) -master-bin.000001 579 Query 1 684 use `test`; insert into t3 select * from t1 where f<6 -master-bin.000001 684 Query 1 780 use `test`; create temporary table t3(f int) -master-bin.000001 780 Query 1 882 use `test`; insert into t2 select count(*) from t3 -master-bin.000001 882 Query 1 988 use `test`; insert into t3 select * from t1 where f>=4 -master-bin.000001 988 Query 1 1075 use `test`; drop temporary table t3 -master-bin.000001 1075 Query 1 1177 use `test`; insert into t2 select count(*) from t3 -master-bin.000001 1177 Query 1 1264 use `test`; drop temporary table t3 +master-bin.000001 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4 +master-bin.000001 96 Query 1 179 use `test`; drop table if exists t1,t2 +master-bin.000001 179 Query 1 258 use `test`; create table t1(f int) +master-bin.000001 258 Query 1 337 use `test`; create table t2(f int) +master-bin.000001 337 Query 1 456 use `test`; insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10) +master-bin.000001 456 Query 1 545 use `test`; create temporary table t3(f int) +master-bin.000001 545 Query 1 643 use `test`; insert into t3 select * from t1 where f<6 +master-bin.000001 643 Query 1 732 use `test`; create temporary table t3(f int) +master-bin.000001 732 Query 1 827 use `test`; insert into t2 select count(*) from t3 +master-bin.000001 827 Query 1 926 use `test`; insert into t3 select * from t1 where f>=4 +master-bin.000001 926 Query 1 1006 use `test`; drop temporary table t3 +master-bin.000001 1006 Query 1 1101 use `test`; insert into t2 select count(*) from t3 +master-bin.000001 1101 Query 1 1181 use `test`; drop temporary table t3 drop table t1, t2; use test; SET TIMESTAMP=1040323920; diff --git a/mysql-test/r/rpl_timezone.result b/mysql-test/r/rpl_timezone.result index ac219fe9d1c..aafb0debd48 100644 --- a/mysql-test/r/rpl_timezone.result +++ b/mysql-test/r/rpl_timezone.result @@ -32,13 +32,13 @@ t 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 95 Server ver: VERSION, Binlog ver: 4 -master-bin.000001 95 Query 1 188 use `test`; create table t1 (t timestamp) -master-bin.000001 188 Query 1 280 use `test`; create table t2 (t char(32)) -master-bin.000001 280 Query 1 372 use `test`; SET ONE_SHOT TIME_ZONE='UTC' -master-bin.000001 372 Query 1 496 use `test`; insert into t1 values ('20040101000000'), ('20040611093902') -master-bin.000001 496 Query 1 574 use `test`; delete from t1 -master-bin.000001 574 Query 1 698 use `test`; insert into t1 values ('20040101000000'), ('20040611093902') +master-bin.000001 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4 +master-bin.000001 96 Query 1 182 use `test`; create table t1 (t timestamp) +master-bin.000001 182 Query 1 267 use `test`; create table t2 (t char(32)) +master-bin.000001 267 Query 1 352 use `test`; SET ONE_SHOT TIME_ZONE='UTC' +master-bin.000001 352 Query 1 469 use `test`; insert into t1 values ('20040101000000'), ('20040611093902') +master-bin.000001 469 Query 1 540 use `test`; delete from t1 +master-bin.000001 540 Query 1 657 use `test`; insert into t1 values ('20040101000000'), ('20040611093902') set time_zone='MET'; insert into t2 (select t from t1); select * from t1; diff --git a/mysql-test/r/rpl_until.result b/mysql-test/r/rpl_until.result index 90ea94b89e6..565229061b2 100644 --- a/mysql-test/r/rpl_until.result +++ b/mysql-test/r/rpl_until.result @@ -14,14 +14,14 @@ insert into t2 values (3),(4); drop table t2; show binlog events; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 4 Format_desc 1 95 Server ver: VERSION, Binlog ver: 4 -master-bin.000001 95 Query 1 217 use `test`; create table t1(n int not null auto_increment primary key) -master-bin.000001 217 Query 1 318 use `test`; insert into t1 values (1),(2),(3),(4) -master-bin.000001 318 Query 1 395 use `test`; drop table t1 -master-bin.000001 395 Query 1 517 use `test`; create table t2(n int not null auto_increment primary key) -master-bin.000001 517 Query 1 610 use `test`; insert into t2 values (1),(2) -master-bin.000001 610 Query 1 703 use `test`; insert into t2 values (3),(4) -master-bin.000001 703 Query 1 780 use `test`; drop table t2 +master-bin.000001 4 Format_desc 1 96 Server ver: VERSION, Binlog ver: 4 +master-bin.000001 96 Query 1 211 use `test`; create table t1(n int not null auto_increment primary key) +master-bin.000001 211 Query 1 305 use `test`; insert into t1 values (1),(2),(3),(4) +master-bin.000001 305 Query 1 375 use `test`; drop table t1 +master-bin.000001 375 Query 1 490 use `test`; create table t2(n int not null auto_increment primary key) +master-bin.000001 490 Query 1 576 use `test`; insert into t2 values (1),(2) +master-bin.000001 576 Query 1 662 use `test`; insert into t2 values (3),(4) +master-bin.000001 662 Query 1 732 use `test`; drop table t2 start slave until master_log_file='master-bin.000001', master_log_pos=304; select * from t1; n @@ -31,7 +31,7 @@ n 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 780 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 318 # Master master-bin.000001 304 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 732 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 305 # Master master-bin.000001 304 No # start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291; select * from t1; n @@ -41,7 +41,7 @@ n 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 780 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 318 # Master master-no-such-bin.000001 291 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 732 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 305 # Master master-no-such-bin.000001 291 No # start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=710; select * from t2; n @@ -49,13 +49,13 @@ n 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 780 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 610 # Relay slave-relay-bin.000004 710 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 732 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 576 # Relay slave-relay-bin.000004 710 No # start slave; stop slave; start slave until master_log_file='master-bin.000001', master_log_pos=710; 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 780 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 780 # Master master-bin.000001 710 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 732 slave-relay-bin.000004 # master-bin.000001 Yes No 0 0 732 # Master master-bin.000001 710 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=561, relay_log_pos=12; diff --git a/mysql-test/r/rpl_user_variables.result b/mysql-test/r/rpl_user_variables.result index 2e39f1f6422..cd49ec3a20c 100644 --- a/mysql-test/r/rpl_user_variables.result +++ b/mysql-test/r/rpl_user_variables.result @@ -76,35 +76,34 @@ abcn1n2 NULL NULL NULL -show binlog events from 95; +show binlog events from 180; Log_name Pos Event_type Server_id End_log_pos Info -slave-bin.000001 95 Query 1 186 use `test`; create table t1(n char(30)) -slave-bin.000001 186 User var 2 229 @`i1`=12345678901234 -slave-bin.000001 229 User var 2 272 @`i2`=-12345678901234 -slave-bin.000001 272 User var 2 315 @`i3`=0 -slave-bin.000001 315 User var 2 358 @`i4`=-1 -slave-bin.000001 358 Query 1 470 use `test`; insert into t1 values (@i1), (@i2), (@i3), (@i4) -slave-bin.000001 470 User var 2 509 @`r1`=12.5 -slave-bin.000001 509 User var 2 548 @`r2`=-12.5 -slave-bin.000001 548 Query 1 646 use `test`; insert into t1 values (@r1), (@r2) -slave-bin.000001 646 User var 2 695 @`s1`=_latin1 0x5468697320697320612074657374 COLLATE latin1_swedish_ci -slave-bin.000001 695 User var 2 730 @`s2`=_latin1 "" COLLATE latin1_swedish_ci -slave-bin.000001 730 User var 2 772 @`s3`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci -slave-bin.000001 772 User var 2 814 @`s4`=_latin1 0x6162635C646566 COLLATE latin1_swedish_ci -slave-bin.000001 814 User var 2 856 @`s5`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci -slave-bin.000001 856 Query 1 975 use `test`; insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5) -slave-bin.000001 975 User var 2 1001 @`n1`=NULL -slave-bin.000001 1001 Query 1 1092 use `test`; insert into t1 values (@n1) -slave-bin.000001 1092 User var 2 1118 @`n2`=NULL -slave-bin.000001 1118 Query 1 1209 use `test`; insert into t1 values (@n2) -slave-bin.000001 1209 Query 1 1326 use `test`; insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1) -slave-bin.000001 1326 User var 2 1368 @`a`=2 -slave-bin.000001 1368 Query 1 1469 use `test`; insert into t1 values (@a+(@b:=@a+1)) -slave-bin.000001 1469 User var 2 1506 @`q`=_latin1 0x616263 COLLATE latin1_swedish_ci -slave-bin.000001 1506 Query 1 1639 use `test`; insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2')) -slave-bin.000001 1639 User var 2 1681 @`a`=5 -slave-bin.000001 1681 Query 1 1776 use `test`; insert into t1 values (@a),(@a) -slave-bin.000001 1776 User var 2 1801 @`a`=NULL -slave-bin.000001 1801 Query 1 1903 use `test`; insert into t1 values (@a),(@a),(@a*5) +slave-bin.000001 180 User var 2 223 @`i1`=12345678901234 +slave-bin.000001 223 User var 2 266 @`i2`=-12345678901234 +slave-bin.000001 266 User var 2 309 @`i3`=0 +slave-bin.000001 309 User var 2 352 @`i4`=-1 +slave-bin.000001 352 Query 1 457 use `test`; insert into t1 values (@i1), (@i2), (@i3), (@i4) +slave-bin.000001 457 User var 2 500 @`r1`=12.5 +slave-bin.000001 500 User var 2 543 @`r2`=-12.5 +slave-bin.000001 543 Query 1 634 use `test`; insert into t1 values (@r1), (@r2) +slave-bin.000001 634 User var 2 683 @`s1`=_latin1 0x5468697320697320612074657374 COLLATE latin1_swedish_ci +slave-bin.000001 683 User var 2 718 @`s2`=_latin1 "" COLLATE latin1_swedish_ci +slave-bin.000001 718 User var 2 760 @`s3`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci +slave-bin.000001 760 User var 2 802 @`s4`=_latin1 0x6162635C646566 COLLATE latin1_swedish_ci +slave-bin.000001 802 User var 2 844 @`s5`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci +slave-bin.000001 844 Query 1 956 use `test`; insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5) +slave-bin.000001 956 User var 2 982 @`n1`=NULL +slave-bin.000001 982 Query 1 1066 use `test`; insert into t1 values (@n1) +slave-bin.000001 1066 User var 2 1092 @`n2`=NULL +slave-bin.000001 1092 Query 1 1176 use `test`; insert into t1 values (@n2) +slave-bin.000001 1176 Query 1 1286 use `test`; insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1) +slave-bin.000001 1286 User var 2 1328 @`a`=2 +slave-bin.000001 1328 Query 1 1422 use `test`; insert into t1 values (@a+(@b:=@a+1)) +slave-bin.000001 1422 User var 2 1459 @`q`=_latin1 0x616263 COLLATE latin1_swedish_ci +slave-bin.000001 1459 Query 1 1585 use `test`; insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2')) +slave-bin.000001 1585 User var 2 1627 @`a`=5 +slave-bin.000001 1627 Query 1 1715 use `test`; insert into t1 values (@a),(@a) +slave-bin.000001 1715 User var 2 1740 @`a`=NULL +slave-bin.000001 1740 Query 1 1835 use `test`; insert into t1 values (@a),(@a),(@a*5) drop table t1; stop slave; diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result index bacd8311a1e..d116cef2383 100644 --- a/mysql-test/r/user_var.result +++ b/mysql-test/r/user_var.result @@ -172,27 +172,24 @@ SET TIMESTAMP=10000; SET @`a b`='hello'; INSERT INTO t1 VALUES(@`a b`); set @var1= "';aaa"; -SET @var2=char(ascii('a')); -insert into t1 values (@var1),(@var2); -show binlog events from 95; +insert into t1 values (@var1); +show binlog events from 96; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 95 User var 1 136 @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci -master-bin.000001 136 Query 1 229 use `test`; INSERT INTO t1 VALUES(@`a b`) -master-bin.000001 229 User var 1 271 @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci -master-bin.000001 271 User var 1 309 @`var2`=_latin1 0x61 COLLATE latin1_swedish_ci -master-bin.000001 309 Query 1 410 use `test`; insert into t1 values (@var1),(@var2) +master-bin.000001 96 User var 1 137 @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci +master-bin.000001 137 Query 1 223 use `test`; INSERT INTO t1 VALUES(@`a b`) +master-bin.000001 223 User var 1 265 @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci +master-bin.000001 265 Query 1 351 use `test`; insert into t1 values (@var1) +flush logs; /*!40019 SET @@session.max_insert_delayed_threads=0*/; -SET @`a b`:=_latin1 0x68656C6C6F COLLATE `latin1_swedish_ci`; +SET @`a b`:=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci; use test; SET TIMESTAMP=10000; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1; SET @@session.sql_mode=0; -SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8; INSERT INTO t1 VALUES(@`a b`); -SET @`var1`:=_latin1 0x273B616161 COLLATE `latin1_swedish_ci`; -SET @`var2`:=_latin1 0x61 COLLATE `latin1_swedish_ci`; +SET @`var1`:=_latin1 0x273B616161 COLLATE latin1_swedish_ci; SET TIMESTAMP=10000; -insert into t1 values (@var1),(@var2); +insert into t1 values (@var1); drop table t1; set @var= NULL ; select FIELD( @var,'1it','Hit') as my_column; diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test index 4780f51ebaa..a648e78a3c7 100644 --- a/mysql-test/t/ctype_ucs.test +++ b/mysql-test/t/ctype_ucs.test @@ -338,7 +338,8 @@ create table t2 (c char(30)) charset=ucs2; set @v=convert('abc' using ucs2); reset master; insert into t2 values (@v); -show binlog events from 95; +show binlog events from 96; +flush logs; # more important than SHOW BINLOG EVENTS, mysqlbinlog (where we # absolutely need variables names to be quoted and strings to be # escaped). diff --git a/mysql-test/t/mix_innodb_myisam_binlog.test b/mysql-test/t/mix_innodb_myisam_binlog.test index 11d3af11c42..d8872fa6a1a 100644 --- a/mysql-test/t/mix_innodb_myisam_binlog.test +++ b/mysql-test/t/mix_innodb_myisam_binlog.test @@ -26,7 +26,7 @@ insert into t2 select * from t1; commit; --replace_column 5 # -show binlog events from 95; +show binlog events from 96; delete from t1; delete from t2; @@ -39,7 +39,7 @@ insert into t2 select * from t1; rollback; --replace_column 5 # -show binlog events from 95; +show binlog events from 96; delete from t1; delete from t2; @@ -54,7 +54,7 @@ rollback to savepoint my_savepoint; commit; --replace_column 5 # -show binlog events from 95; +show binlog events from 96; delete from t1; delete from t2; @@ -71,7 +71,7 @@ commit; select a from t1 order by a; # check that savepoints work :) --replace_column 5 # -show binlog events from 95; +show binlog events from 96; # and when ROLLBACK is not explicit? delete from t1; @@ -92,7 +92,7 @@ connection con2; # logging has been done, we use a user lock. select get_lock("a",10); --replace_column 5 # -show binlog events from 95; +show binlog events from 96; # and when not in a transact1on? delete from t1; @@ -103,7 +103,7 @@ insert into t1 values(9); insert into t2 select * from t1; --replace_column 5 # -show binlog events from 95; +show binlog events from 96; # Check that when the query updat1ng the MyISAM table is the first in the # transaction, we log it immediately. @@ -115,12 +115,12 @@ insert into t1 values(10); # first make t1 non-empty begin; insert into t2 select * from t1; --replace_column 5 # -show binlog events from 95; +show binlog events from 96; insert into t1 values(11); commit; --replace_column 5 # -show binlog events from 95; +show binlog events from 96; # Check that things work like before this BEGIN/ROLLBACK code was added, @@ -138,7 +138,7 @@ insert into t2 select * from t1; commit; --replace_column 5 # -show binlog events from 95; +show binlog events from 96; delete from t1; delete from t2; @@ -150,7 +150,7 @@ insert into t2 select * from t1; rollback; --replace_column 5 # -show binlog events from 95; +show binlog events from 96; delete from t1; delete from t2; @@ -165,7 +165,7 @@ rollback to savepoint my_savepoint; commit; --replace_column 5 # -show binlog events from 95; +show binlog events from 96; delete from t1; delete from t2; @@ -182,7 +182,7 @@ commit; select a from t1 order by a; # check that savepoints work :) --replace_column 5 # -show binlog events from 95; +show binlog events from 96; # Test for BUG#5714, where a MyISAM update in the transaction used to # release row-level locks in InnoDB diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 7f0a963adde..3f2ab2b31ec 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -61,7 +61,7 @@ select "--- --database --" as ""; select "--- --position --" as ""; --enable_query_log --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --position=118 $MYSQL_TEST_DIR/var/log/master-bin.000002 +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --position=119 $MYSQL_TEST_DIR/var/log/master-bin.000002 # These are tests for remote binlog. # They should return the same as previous test. @@ -93,7 +93,7 @@ select "--- --database --" as ""; select "--- --position --" as ""; --enable_query_log --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --read-from-remote-server --position=118 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 +--exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --read-from-remote-server --position=119 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 # Bug#7853 (mysqlbinlog does not accept input from stdin) --disable_query_log @@ -107,3 +107,4 @@ select "--- reading stdin --" as ""; # clean up drop table t1, t2; + diff --git a/mysql-test/t/mysqlbinlog2.test b/mysql-test/t/mysqlbinlog2.test index 6a4c99c746d..f2360d51c16 100644 --- a/mysql-test/t/mysqlbinlog2.test +++ b/mysql-test/t/mysqlbinlog2.test @@ -46,11 +46,11 @@ select "--- offset --" as ""; --disable_query_log select "--- start-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --start-position=601 $MYSQL_TEST_DIR/var/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form --start-position=602 $MYSQL_TEST_DIR/var/log/master-bin.000001 --disable_query_log select "--- stop-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --stop-position=601 $MYSQL_TEST_DIR/var/log/master-bin.000001 +--exec $MYSQL_BINLOG --short-form --stop-position=602 $MYSQL_TEST_DIR/var/log/master-bin.000001 --disable_query_log select "--- start-datetime --" as ""; --enable_query_log @@ -75,11 +75,11 @@ select "--- offset --" as ""; --disable_query_log select "--- start-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --start-position=601 $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002 +--exec $MYSQL_BINLOG --short-form --start-position=602 $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002 --disable_query_log select "--- stop-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --stop-position=123 $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002 +--exec $MYSQL_BINLOG --short-form --stop-position=124 $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002 --disable_query_log select "--- start-datetime --" as ""; --enable_query_log @@ -102,11 +102,11 @@ select "--- offset --" as ""; --disable_query_log select "--- start-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --start-position=601 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 +--exec $MYSQL_BINLOG --short-form --start-position=602 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 --disable_query_log select "--- stop-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --stop-position=601 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 +--exec $MYSQL_BINLOG --short-form --stop-position=602 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 --disable_query_log select "--- start-datetime --" as ""; --enable_query_log @@ -129,11 +129,11 @@ select "--- offset --" as ""; --disable_query_log select "--- start-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --start-position=601 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 +--exec $MYSQL_BINLOG --short-form --start-position=602 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 --disable_query_log select "--- stop-position --" as ""; --enable_query_log ---exec $MYSQL_BINLOG --short-form --stop-position=123 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 +--exec $MYSQL_BINLOG --short-form --stop-position=124 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 master-bin.000002 --disable_query_log select "--- start-datetime --" as ""; --enable_query_log diff --git a/mysql-test/t/rpl_charset.test b/mysql-test/t/rpl_charset.test index e8a12ff8317..c61df09fdcc 100644 --- a/mysql-test/t/rpl_charset.test +++ b/mysql-test/t/rpl_charset.test @@ -107,7 +107,7 @@ connection master; drop database mysqltest2; drop database mysqltest3; --replace_column 2 # 5 # -show binlog events from 95; +show binlog events from 96; sync_slave_with_master; # Check that we can change global.collation_server (since 5.0.3) @@ -156,3 +156,4 @@ connection master; --exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 drop table t1; sync_slave_with_master; + diff --git a/mysql-test/t/rpl_error_ignored_table.test b/mysql-test/t/rpl_error_ignored_table.test index 487869e5fef..a520024b7da 100644 --- a/mysql-test/t/rpl_error_ignored_table.test +++ b/mysql-test/t/rpl_error_ignored_table.test @@ -48,7 +48,7 @@ connection master; --error 0,1053; reap; connection master1; -show binlog events from 95; +show binlog events from 96; save_master_pos; connection slave; # SQL slave thread should not have stopped (because table of the killed diff --git a/mysql-test/t/rpl_loaddata_rule_m.test b/mysql-test/t/rpl_loaddata_rule_m.test index 3f19a09c6f7..ff00e8f4925 100644 --- a/mysql-test/t/rpl_loaddata_rule_m.test +++ b/mysql-test/t/rpl_loaddata_rule_m.test @@ -19,5 +19,5 @@ create database mysqltest; 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 95; # should be nothing +show binlog events from 96; # should be nothing drop database mysqltest; diff --git a/mysql-test/t/rpl_loaddata_rule_s.test b/mysql-test/t/rpl_loaddata_rule_s.test index 8163cd20f00..71a3929da32 100644 --- a/mysql-test/t/rpl_loaddata_rule_s.test +++ b/mysql-test/t/rpl_loaddata_rule_s.test @@ -17,4 +17,4 @@ save_master_pos; connection slave; sync_with_master; select count(*) from t1; # check that LOAD was replicated -show binlog events from 95; # should be nothing +show binlog events from 96; # should be nothing diff --git a/mysql-test/t/rpl_log.test b/mysql-test/t/rpl_log.test index 178199d6160..055c1a7c93a 100644 --- a/mysql-test/t/rpl_log.test +++ b/mysql-test/t/rpl_log.test @@ -38,9 +38,9 @@ select count(*) from t1; drop table t1; --replace_result $VERSION VERSION show binlog events; -show binlog events from 95 limit 1; -show binlog events from 95 limit 2; -show binlog events from 95 limit 2,1; +show binlog events from 96 limit 1; +show binlog events from 96 limit 2; +show binlog events from 96 limit 2,1; flush logs; # We need an extra update before doing save_master_pos. diff --git a/mysql-test/t/rpl_log_pos.test b/mysql-test/t/rpl_log_pos.test index 634bf9449fd..c9d7056924f 100644 --- a/mysql-test/t/rpl_log_pos.test +++ b/mysql-test/t/rpl_log_pos.test @@ -38,7 +38,7 @@ insert into t1 values (1),(2),(3); save_master_pos; connection slave; stop slave; -change master to master_log_pos=95; +change master to master_log_pos=96; start slave; sync_with_master; select * from t1; diff --git a/mysql-test/t/rpl_user_variables.test b/mysql-test/t/rpl_user_variables.test index c0327a7ddb3..47bc9de37ba 100644 --- a/mysql-test/t/rpl_user_variables.test +++ b/mysql-test/t/rpl_user_variables.test @@ -46,7 +46,7 @@ save_master_pos; connection slave; sync_with_master; select * from t1; -show binlog events from 95; +show binlog events from 96; connection master; drop table t1; save_master_pos; diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test index 49cf981b966..07c38094fe1 100644 --- a/mysql-test/t/user_var.test +++ b/mysql-test/t/user_var.test @@ -110,7 +110,8 @@ INSERT INTO t1 VALUES(@`a b`); set @var1= "';aaa"; SET @var2=char(ascii('a')); insert into t1 values (@var1),(@var2); -show binlog events from 95; +show binlog events from 96; +flush logs; # more important than SHOW BINLOG EVENTS, mysqlbinlog (where we # absolutely need variables names to be quoted and strings to be # escaped). |