1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

backporting bug@27808 fixes

Browse Source
This commit is contained in:
Andrei Elkin 2009-10-01 19:44:53 +03:00
parent c676cebbea
commit d91aa57c38
62 changed files with 1127 additions and 513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/master-slave.inc
View File

@ -8,5 +8,7 @@ connect (slave1,127.0.0.1,root,,test,$SLAVE_MYPORT,);
-- source include/master-slave-reset.inc
connection master;
sync_slave_with_master;
# Set the default connection to 'master'
connection master;

14
mysql-test/r/ctype_cp932_binlog_stm.result
View File

@ -29,22 +29,22 @@ HEX(s1) HEX(s2) d
466F6F2773206120426172 ED40ED41ED42 47.93
DROP PROCEDURE bug18293|
DROP TABLE t4|
SHOW BINLOG EVENTS FROM 370|
SHOW BINLOG EVENTS FROM 371|
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 370 Query 1 536 use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
master-bin.000001 371 Query 1 537 use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
s2 CHAR(50) CHARACTER SET cp932,
d DECIMAL(10,2))
master-bin.000001 536 Query 1 785 use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `bug18293`(IN ins1 CHAR(50),
master-bin.000001 537 Query 1 786 use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `bug18293`(IN ins1 CHAR(50),
IN ins2 CHAR(50) CHARACTER SET cp932,
IN ind DECIMAL(10,2))
BEGIN
INSERT INTO t4 VALUES (ins1, ins2, ind);
END
master-bin.000001 785 Query 1 1049 use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172 COLLATE 'latin1_swedish_ci'), NAME_CONST('ins2',_cp932 0xED40ED41ED42 COLLATE 'cp932_japanese_ci'), NAME_CONST('ind',47.93))
master-bin.000001 1049 Query 1 1138 use `test`; DROP PROCEDURE bug18293
master-bin.000001 1138 Query 1 1217 use `test`; DROP TABLE t4
master-bin.000001 786 Query 1 1050 use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172 COLLATE 'latin1_swedish_ci'), NAME_CONST('ins2',_cp932 0xED40ED41ED42 COLLATE 'cp932_japanese_ci'), NAME_CONST('ind',47.93))
master-bin.000001 1050 Query 1 1139 use `test`; DROP PROCEDURE bug18293
master-bin.000001 1139 Query 1 1218 use `test`; DROP TABLE t4
End of 5.0 tests
SHOW BINLOG EVENTS FROM 365;
SHOW BINLOG EVENTS FROM 366;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error
Bug#44352 UPPER/LOWER function doesn't work correctly on cp932 and sjis environment.
CREATE TABLE t1 (a varchar(16)) character set cp932;

4
mysql-test/r/flush_block_commit_notembedded.result
View File

@ -9,13 +9,13 @@ INSERT t1 VALUES (1);
FLUSH TABLES WITH READ LOCK;
SHOW MASTER STATUS;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 106
master-bin.000001 107
# Switch to connection con1
COMMIT;
# Switch to connection con2
SHOW MASTER STATUS;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 106
master-bin.000001 107
UNLOCK TABLES;
# Switch to connection con1
DROP TABLE t1;

4
mysql-test/r/multi_update.result
View File

@ -604,7 +604,7 @@ a b
4 4
show master status /* there must be the UPDATE query event */;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 206
master-bin.000001 207
delete from t1;
delete from t2;
insert into t1 values (1,2),(3,4),(4,4);
@ -614,7 +614,7 @@ UPDATE t2,t1 SET t2.a=t2.b where t2.a=t1.a;
ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
show master status /* there must be the UPDATE query event */;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 221
master-bin.000001 222
drop table t1, t2;
set @@session.binlog_format= @sav_binlog_format;
drop table if exists t1, t2, t3;

20
mysql-test/r/outfile_loaddata.result
View File

@ -92,14 +92,14 @@ HEX(c1)
C3
SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/bug32533.txt' FIELDS ENCLOSED BY 0xC3 FROM t1;
Warnings:
Warning 1638 Non-ASCII separator arguments are not fully supported
Warning 1639 Non-ASCII separator arguments are not fully supported
TRUNCATE t1;
SELECT HEX(LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug32533.txt'));
HEX(LOAD_FILE('MYSQLTEST_VARDIR/tmp/bug32533.txt'))
C35CC3C30A
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug32533.txt' INTO TABLE t1 FIELDS ENCLOSED BY 0xC3;
Warnings:
Warning 1638 Non-ASCII separator arguments are not fully supported
Warning 1639 Non-ASCII separator arguments are not fully supported
SELECT HEX(c1) FROM t1;
HEX(c1)
C3
@ -124,17 +124,17 @@ ERROR 42000: Field separator argument is not what is expected; check the manual
# LOAD DATA rises error or has unpredictable result -- to be fixed later
SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FIELDS ENCLOSED BY 'ÑŠ';
Warnings:
Warning 1638 Non-ASCII separator arguments are not fully supported
Warning 1639 Non-ASCII separator arguments are not fully supported
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary FIELDS ENCLOSED BY 'ÑŠ';
ERROR 42000: Field separator argument is not what is expected; check the manual
SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FIELDS ESCAPED BY 'ÑŠ';
Warnings:
Warning 1638 Non-ASCII separator arguments are not fully supported
Warning 1639 Non-ASCII separator arguments are not fully supported
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary FIELDS ESCAPED BY 'ÑŠ';
ERROR 42000: Field separator argument is not what is expected; check the manual
SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FIELDS TERMINATED BY 'ÑŠ';
Warnings:
Warning 1638 Non-ASCII separator arguments are not fully supported
Warning 1639 Non-ASCII separator arguments are not fully supported
##################################################
1ÑŠABC-áâ÷ÑŠDEF-ÂÃÄ
2ÑŠ\NÑŠ\N
@ -142,7 +142,7 @@ Warning 1638 Non-ASCII separator arguments are not fully supported
TRUNCATE t2;
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary FIELDS TERMINATED BY 'ÑŠ';
Warnings:
Warning 1638 Non-ASCII separator arguments are not fully supported
Warning 1639 Non-ASCII separator arguments are not fully supported
Warning 1265 Data truncated for column 'a' at row 1
Warning 1261 Row 1 doesn't contain data for all columns
Warning 1261 Row 1 doesn't contain data for all columns
@ -156,7 +156,7 @@ a b c
2 NULL NULL
SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' LINES STARTING BY 'ÑŠ';
Warnings:
Warning 1638 Non-ASCII separator arguments are not fully supported
Warning 1639 Non-ASCII separator arguments are not fully supported
##################################################
ÑŠ1 ABC-áâ÷ DEF-ÂÃÄ
ÑŠ2 \N \N
@ -164,20 +164,20 @@ Warning 1638 Non-ASCII separator arguments are not fully supported
TRUNCATE t2;
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary LINES STARTING BY 'ÑŠ';
Warnings:
Warning 1638 Non-ASCII separator arguments are not fully supported
Warning 1639 Non-ASCII separator arguments are not fully supported
SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
a b c
1 ABC-Ð<>БВ DEF-ÂÃÄ
2 NULL NULL
SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' LINES TERMINATED BY 'ÑŠ';
Warnings:
Warning 1638 Non-ASCII separator arguments are not fully supported
Warning 1639 Non-ASCII separator arguments are not fully supported
##################################################
1 ABC-áâ÷ DEF-ÂÃÄÑŠ2 \N \NÑŠ##################################################
TRUNCATE t2;
LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary LINES TERMINATED BY 'ÑŠ';
Warnings:
Warning 1638 Non-ASCII separator arguments are not fully supported
Warning 1639 Non-ASCII separator arguments are not fully supported
SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
a b c
1 ABC-Ð<>БВ DEF-ÂÃÄ

2
mysql-test/r/strict.result
View File

@ -1327,7 +1327,7 @@ create table t1
123456789*123456789*123456789*123456789*
123456789*123456789*123456789*123456789*');
Warnings:
Warning 1629 Comment for field 'i' is too long (max = 255)
Warning 1630 Comment for field 'i' is too long (max = 255)
select column_name, column_comment from information_schema.columns where
table_schema = 'test' and table_name = 't1';
column_name column_comment

37
mysql-test/suite/binlog/r/binlog_row_binlog.result
View File

@ -247,25 +247,8 @@ commit;
drop table t1;
show binlog events from 0;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4
master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=innodb
master-bin.000001 205 Query 1 273 BEGIN
master-bin.000001 273 Table_map 1 314 table_id: # (test.t1)
master-bin.000001 314 Write_rows 1 348 table_id: # flags: STMT_END_F
master-bin.000001 348 Table_map 1 389 table_id: # (test.t1)
master-bin.000001 389 Write_rows 1 423 table_id: # flags: STMT_END_F
master-bin.000001 423 Table_map 1 464 table_id: # (test.t1)
master-bin.000001 464 Write_rows 1 498 table_id: # flags: STMT_END_F
master-bin.000001 498 Xid 1 525 COMMIT /* XID */
master-bin.000001 525 Query 1 601 use `test`; drop table t1
set @bcs = @@binlog_cache_size;
set global binlog_cache_size=4096;
reset master;
create table t1 (a int) engine=innodb;
show binlog events from 0;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4
master-bin.000001 106 Query 1 206 use `test`; create table t1 (a int) engine=innodb
master-bin.000001 4 Format_desc 1 107 Server version, Binlog ver: 4
master-bin.000001 107 Query 1 206 use `test`; create table t1(n int) engine=innodb
master-bin.000001 206 Query 1 274 BEGIN
master-bin.000001 274 Table_map 1 315 table_id: # (test.t1)
master-bin.000001 315 Write_rows 1 349 table_id: # flags: STMT_END_F
@ -283,7 +266,7 @@ show binlog events from 0;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 107 Server version, Binlog ver: 4
master-bin.000001 107 Query 1 207 use `test`; create table t1 (a int) engine=innodb
master-bin.000001 207 Query 1 275 use `test`; BEGIN
master-bin.000001 207 Query 1 275 BEGIN
master-bin.000001 275 Table_map 1 316 table_id: # (test.t1)
master-bin.000001 316 Write_rows 1 350 table_id: # flags: STMT_END_F
master-bin.000001 350 Table_map 1 391 table_id: # (test.t1)
@ -1100,13 +1083,13 @@ deallocate prepare stmt;
drop table t1;
show binlog events from 0;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4
master-bin.000001 106 Query 1 227 use `test`; create table t1 (a bigint unsigned, b bigint(20) unsigned)
master-bin.000001 227 Query 1 295 BEGIN
master-bin.000001 295 Table_map 1 337 table_id: # (test.t1)
master-bin.000001 337 Write_rows 1 383 table_id: # flags: STMT_END_F
master-bin.000001 383 Query 1 452 COMMIT
master-bin.000001 452 Query 1 528 use `test`; drop table t1
master-bin.000001 4 Format_desc 1 107 Server version, Binlog ver: 4
master-bin.000001 107 Query 1 228 use `test`; create table t1 (a bigint unsigned, b bigint(20) unsigned)
master-bin.000001 228 Query 1 296 BEGIN
master-bin.000001 296 Table_map 1 338 table_id: # (test.t1)
master-bin.000001 338 Write_rows 1 384 table_id: # flags: STMT_END_F
master-bin.000001 384 Query 1 453 COMMIT
master-bin.000001 453 Query 1 529 use `test`; drop table t1
reset master;
CREATE DATABASE bug39182 DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
USE bug39182;

844
mysql-test/suite/binlog/r/binlog_stm_binlog.result
View File

@ -4,11 +4,11 @@ insert into t1 values (1,2);
commit;
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 106 Server ver: #, Binlog ver: #
master-bin.000001 106 Query 1 213 use `test`; create table t1 (a int, b int) engine=innodb
master-bin.000001 213 Query 1 281 BEGIN
master-bin.000001 281 Query 1 371 use `test`; insert into t1 values (1,2)
master-bin.000001 371 Xid 1 398 COMMIT /* XID */
master-bin.000001 4 Format_desc 1 107 Server ver: #, Binlog ver: #
master-bin.000001 107 Query 1 214 use `test`; create table t1 (a int, b int) engine=innodb
master-bin.000001 214 Query 1 282 BEGIN
master-bin.000001 282 Query 1 372 use `test`; insert into t1 values (1,2)
master-bin.000001 372 Xid 1 399 COMMIT /* XID */
drop table t1;
drop table if exists t1, t2;
reset master;
@ -157,425 +157,425 @@ commit;
drop table t1;
show binlog events from 0;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4
master-bin.000001 106 Query 1 205 use `test`; create table t1(n int) engine=innodb
master-bin.000001 205 Query 1 273 BEGIN
master-bin.000001 273 Query 1 361 use `test`; insert into t1 values (1)
master-bin.000001 361 Query 1 449 use `test`; insert into t1 values (2)
master-bin.000001 449 Query 1 537 use `test`; insert into t1 values (3)
master-bin.000001 537 Xid 1 564 COMMIT /* XID */
master-bin.000001 564 Query 1 640 use `test`; drop table t1
master-bin.000001 4 Format_desc 1 107 Server version, Binlog ver: 4
master-bin.000001 107 Query 1 206 use `test`; create table t1(n int) engine=innodb
master-bin.000001 206 Query 1 274 BEGIN
master-bin.000001 274 Query 1 362 use `test`; insert into t1 values (1)
master-bin.000001 362 Query 1 450 use `test`; insert into t1 values (2)
master-bin.000001 450 Query 1 538 use `test`; insert into t1 values (3)
master-bin.000001 538 Xid 1 565 COMMIT /* XID */
master-bin.000001 565 Query 1 641 use `test`; drop table t1
set @bcs = @@binlog_cache_size;
set global binlog_cache_size=4096;
reset master;
create table t1 (a int) engine=innodb;
show binlog events from 0;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4
master-bin.000001 106 Query 1 206 use `test`; create table t1 (a int) engine=innodb
master-bin.000001 206 Query 1 274 BEGIN
master-bin.000001 274 Query 1 365 use `test`; insert into t1 values( 400 )
master-bin.000001 365 Query 1 456 use `test`; insert into t1 values( 399 )
master-bin.000001 456 Query 1 547 use `test`; insert into t1 values( 398 )
master-bin.000001 547 Query 1 638 use `test`; insert into t1 values( 397 )
master-bin.000001 638 Query 1 729 use `test`; insert into t1 values( 396 )
master-bin.000001 729 Query 1 820 use `test`; insert into t1 values( 395 )
master-bin.000001 820 Query 1 911 use `test`; insert into t1 values( 394 )
master-bin.000001 911 Query 1 1002 use `test`; insert into t1 values( 393 )
master-bin.000001 1002 Query 1 1093 use `test`; insert into t1 values( 392 )
master-bin.000001 1093 Query 1 1184 use `test`; insert into t1 values( 391 )
master-bin.000001 1184 Query 1 1275 use `test`; insert into t1 values( 390 )
master-bin.000001 1275 Query 1 1366 use `test`; insert into t1 values( 389 )
master-bin.000001 1366 Query 1 1457 use `test`; insert into t1 values( 388 )
master-bin.000001 1457 Query 1 1548 use `test`; insert into t1 values( 387 )
master-bin.000001 1548 Query 1 1639 use `test`; insert into t1 values( 386 )
master-bin.000001 1639 Query 1 1730 use `test`; insert into t1 values( 385 )
master-bin.000001 1730 Query 1 1821 use `test`; insert into t1 values( 384 )
master-bin.000001 1821 Query 1 1912 use `test`; insert into t1 values( 383 )
master-bin.000001 1912 Query 1 2003 use `test`; insert into t1 values( 382 )
master-bin.000001 2003 Query 1 2094 use `test`; insert into t1 values( 381 )
master-bin.000001 2094 Query 1 2185 use `test`; insert into t1 values( 380 )
master-bin.000001 2185 Query 1 2276 use `test`; insert into t1 values( 379 )
master-bin.000001 2276 Query 1 2367 use `test`; insert into t1 values( 378 )
master-bin.000001 2367 Query 1 2458 use `test`; insert into t1 values( 377 )
master-bin.000001 2458 Query 1 2549 use `test`; insert into t1 values( 376 )
master-bin.000001 2549 Query 1 2640 use `test`; insert into t1 values( 375 )
master-bin.000001 2640 Query 1 2731 use `test`; insert into t1 values( 374 )
master-bin.000001 2731 Query 1 2822 use `test`; insert into t1 values( 373 )
master-bin.000001 2822 Query 1 2913 use `test`; insert into t1 values( 372 )
master-bin.000001 2913 Query 1 3004 use `test`; insert into t1 values( 371 )
master-bin.000001 3004 Query 1 3095 use `test`; insert into t1 values( 370 )
master-bin.000001 3095 Query 1 3186 use `test`; insert into t1 values( 369 )
master-bin.000001 3186 Query 1 3277 use `test`; insert into t1 values( 368 )
master-bin.000001 3277 Query 1 3368 use `test`; insert into t1 values( 367 )
master-bin.000001 3368 Query 1 3459 use `test`; insert into t1 values( 366 )
master-bin.000001 3459 Query 1 3550 use `test`; insert into t1 values( 365 )
master-bin.000001 3550 Query 1 3641 use `test`; insert into t1 values( 364 )
master-bin.000001 3641 Query 1 3732 use `test`; insert into t1 values( 363 )
master-bin.000001 3732 Query 1 3823 use `test`; insert into t1 values( 362 )
master-bin.000001 3823 Query 1 3914 use `test`; insert into t1 values( 361 )
master-bin.000001 3914 Query 1 4005 use `test`; insert into t1 values( 360 )
master-bin.000001 4005 Query 1 4096 use `test`; insert into t1 values( 359 )
master-bin.000001 4096 Query 1 4187 use `test`; insert into t1 values( 358 )
master-bin.000001 4187 Query 1 4278 use `test`; insert into t1 values( 357 )
master-bin.000001 4278 Query 1 4369 use `test`; insert into t1 values( 356 )
master-bin.000001 4369 Query 1 4460 use `test`; insert into t1 values( 355 )
master-bin.000001 4460 Query 1 4551 use `test`; insert into t1 values( 354 )
master-bin.000001 4551 Query 1 4642 use `test`; insert into t1 values( 353 )
master-bin.000001 4642 Query 1 4733 use `test`; insert into t1 values( 352 )
master-bin.000001 4733 Query 1 4824 use `test`; insert into t1 values( 351 )
master-bin.000001 4824 Query 1 4915 use `test`; insert into t1 values( 350 )
master-bin.000001 4915 Query 1 5006 use `test`; insert into t1 values( 349 )
master-bin.000001 5006 Query 1 5097 use `test`; insert into t1 values( 348 )
master-bin.000001 5097 Query 1 5188 use `test`; insert into t1 values( 347 )
master-bin.000001 5188 Query 1 5279 use `test`; insert into t1 values( 346 )
master-bin.000001 5279 Query 1 5370 use `test`; insert into t1 values( 345 )
master-bin.000001 5370 Query 1 5461 use `test`; insert into t1 values( 344 )
master-bin.000001 5461 Query 1 5552 use `test`; insert into t1 values( 343 )
master-bin.000001 5552 Query 1 5643 use `test`; insert into t1 values( 342 )
master-bin.000001 5643 Query 1 5734 use `test`; insert into t1 values( 341 )
master-bin.000001 5734 Query 1 5825 use `test`; insert into t1 values( 340 )
master-bin.000001 5825 Query 1 5916 use `test`; insert into t1 values( 339 )
master-bin.000001 5916 Query 1 6007 use `test`; insert into t1 values( 338 )
master-bin.000001 6007 Query 1 6098 use `test`; insert into t1 values( 337 )
master-bin.000001 6098 Query 1 6189 use `test`; insert into t1 values( 336 )
master-bin.000001 6189 Query 1 6280 use `test`; insert into t1 values( 335 )
master-bin.000001 6280 Query 1 6371 use `test`; insert into t1 values( 334 )
master-bin.000001 6371 Query 1 6462 use `test`; insert into t1 values( 333 )
master-bin.000001 6462 Query 1 6553 use `test`; insert into t1 values( 332 )
master-bin.000001 6553 Query 1 6644 use `test`; insert into t1 values( 331 )
master-bin.000001 6644 Query 1 6735 use `test`; insert into t1 values( 330 )
master-bin.000001 6735 Query 1 6826 use `test`; insert into t1 values( 329 )
master-bin.000001 6826 Query 1 6917 use `test`; insert into t1 values( 328 )
master-bin.000001 6917 Query 1 7008 use `test`; insert into t1 values( 327 )
master-bin.000001 7008 Query 1 7099 use `test`; insert into t1 values( 326 )
master-bin.000001 7099 Query 1 7190 use `test`; insert into t1 values( 325 )
master-bin.000001 7190 Query 1 7281 use `test`; insert into t1 values( 324 )
master-bin.000001 7281 Query 1 7372 use `test`; insert into t1 values( 323 )
master-bin.000001 7372 Query 1 7463 use `test`; insert into t1 values( 322 )
master-bin.000001 7463 Query 1 7554 use `test`; insert into t1 values( 321 )
master-bin.000001 7554 Query 1 7645 use `test`; insert into t1 values( 320 )
master-bin.000001 7645 Query 1 7736 use `test`; insert into t1 values( 319 )
master-bin.000001 7736 Query 1 7827 use `test`; insert into t1 values( 318 )
master-bin.000001 7827 Query 1 7918 use `test`; insert into t1 values( 317 )
master-bin.000001 7918 Query 1 8009 use `test`; insert into t1 values( 316 )
master-bin.000001 8009 Query 1 8100 use `test`; insert into t1 values( 315 )
master-bin.000001 8100 Query 1 8191 use `test`; insert into t1 values( 314 )
master-bin.000001 8191 Query 1 8282 use `test`; insert into t1 values( 313 )
master-bin.000001 8282 Query 1 8373 use `test`; insert into t1 values( 312 )
master-bin.000001 8373 Query 1 8464 use `test`; insert into t1 values( 311 )
master-bin.000001 8464 Query 1 8555 use `test`; insert into t1 values( 310 )
master-bin.000001 8555 Query 1 8646 use `test`; insert into t1 values( 309 )
master-bin.000001 8646 Query 1 8737 use `test`; insert into t1 values( 308 )
master-bin.000001 8737 Query 1 8828 use `test`; insert into t1 values( 307 )
master-bin.000001 8828 Query 1 8919 use `test`; insert into t1 values( 306 )
master-bin.000001 8919 Query 1 9010 use `test`; insert into t1 values( 305 )
master-bin.000001 9010 Query 1 9101 use `test`; insert into t1 values( 304 )
master-bin.000001 9101 Query 1 9192 use `test`; insert into t1 values( 303 )
master-bin.000001 9192 Query 1 9283 use `test`; insert into t1 values( 302 )
master-bin.000001 9283 Query 1 9374 use `test`; insert into t1 values( 301 )
master-bin.000001 9374 Query 1 9465 use `test`; insert into t1 values( 300 )
master-bin.000001 9465 Query 1 9556 use `test`; insert into t1 values( 299 )
master-bin.000001 9556 Query 1 9647 use `test`; insert into t1 values( 298 )
master-bin.000001 9647 Query 1 9738 use `test`; insert into t1 values( 297 )
master-bin.000001 9738 Query 1 9829 use `test`; insert into t1 values( 296 )
master-bin.000001 9829 Query 1 9920 use `test`; insert into t1 values( 295 )
master-bin.000001 9920 Query 1 10011 use `test`; insert into t1 values( 294 )
master-bin.000001 10011 Query 1 10102 use `test`; insert into t1 values( 293 )
master-bin.000001 10102 Query 1 10193 use `test`; insert into t1 values( 292 )
master-bin.000001 10193 Query 1 10284 use `test`; insert into t1 values( 291 )
master-bin.000001 10284 Query 1 10375 use `test`; insert into t1 values( 290 )
master-bin.000001 10375 Query 1 10466 use `test`; insert into t1 values( 289 )
master-bin.000001 10466 Query 1 10557 use `test`; insert into t1 values( 288 )
master-bin.000001 10557 Query 1 10648 use `test`; insert into t1 values( 287 )
master-bin.000001 10648 Query 1 10739 use `test`; insert into t1 values( 286 )
master-bin.000001 10739 Query 1 10830 use `test`; insert into t1 values( 285 )
master-bin.000001 10830 Query 1 10921 use `test`; insert into t1 values( 284 )
master-bin.000001 10921 Query 1 11012 use `test`; insert into t1 values( 283 )
master-bin.000001 11012 Query 1 11103 use `test`; insert into t1 values( 282 )
master-bin.000001 11103 Query 1 11194 use `test`; insert into t1 values( 281 )
master-bin.000001 11194 Query 1 11285 use `test`; insert into t1 values( 280 )
master-bin.000001 11285 Query 1 11376 use `test`; insert into t1 values( 279 )
master-bin.000001 11376 Query 1 11467 use `test`; insert into t1 values( 278 )
master-bin.000001 11467 Query 1 11558 use `test`; insert into t1 values( 277 )
master-bin.000001 11558 Query 1 11649 use `test`; insert into t1 values( 276 )
master-bin.000001 11649 Query 1 11740 use `test`; insert into t1 values( 275 )
master-bin.000001 11740 Query 1 11831 use `test`; insert into t1 values( 274 )
master-bin.000001 11831 Query 1 11922 use `test`; insert into t1 values( 273 )
master-bin.000001 11922 Query 1 12013 use `test`; insert into t1 values( 272 )
master-bin.000001 12013 Query 1 12104 use `test`; insert into t1 values( 271 )
master-bin.000001 12104 Query 1 12195 use `test`; insert into t1 values( 270 )
master-bin.000001 12195 Query 1 12286 use `test`; insert into t1 values( 269 )
master-bin.000001 12286 Query 1 12377 use `test`; insert into t1 values( 268 )
master-bin.000001 12377 Query 1 12468 use `test`; insert into t1 values( 267 )
master-bin.000001 12468 Query 1 12559 use `test`; insert into t1 values( 266 )
master-bin.000001 12559 Query 1 12650 use `test`; insert into t1 values( 265 )
master-bin.000001 12650 Query 1 12741 use `test`; insert into t1 values( 264 )
master-bin.000001 12741 Query 1 12832 use `test`; insert into t1 values( 263 )
master-bin.000001 12832 Query 1 12923 use `test`; insert into t1 values( 262 )
master-bin.000001 12923 Query 1 13014 use `test`; insert into t1 values( 261 )
master-bin.000001 13014 Query 1 13105 use `test`; insert into t1 values( 260 )
master-bin.000001 13105 Query 1 13196 use `test`; insert into t1 values( 259 )
master-bin.000001 13196 Query 1 13287 use `test`; insert into t1 values( 258 )
master-bin.000001 13287 Query 1 13378 use `test`; insert into t1 values( 257 )
master-bin.000001 13378 Query 1 13469 use `test`; insert into t1 values( 256 )
master-bin.000001 13469 Query 1 13560 use `test`; insert into t1 values( 255 )
master-bin.000001 13560 Query 1 13651 use `test`; insert into t1 values( 254 )
master-bin.000001 13651 Query 1 13742 use `test`; insert into t1 values( 253 )
master-bin.000001 13742 Query 1 13833 use `test`; insert into t1 values( 252 )
master-bin.000001 13833 Query 1 13924 use `test`; insert into t1 values( 251 )
master-bin.000001 13924 Query 1 14015 use `test`; insert into t1 values( 250 )
master-bin.000001 14015 Query 1 14106 use `test`; insert into t1 values( 249 )
master-bin.000001 14106 Query 1 14197 use `test`; insert into t1 values( 248 )
master-bin.000001 14197 Query 1 14288 use `test`; insert into t1 values( 247 )
master-bin.000001 14288 Query 1 14379 use `test`; insert into t1 values( 246 )
master-bin.000001 14379 Query 1 14470 use `test`; insert into t1 values( 245 )
master-bin.000001 14470 Query 1 14561 use `test`; insert into t1 values( 244 )
master-bin.000001 14561 Query 1 14652 use `test`; insert into t1 values( 243 )
master-bin.000001 14652 Query 1 14743 use `test`; insert into t1 values( 242 )
master-bin.000001 14743 Query 1 14834 use `test`; insert into t1 values( 241 )
master-bin.000001 14834 Query 1 14925 use `test`; insert into t1 values( 240 )
master-bin.000001 14925 Query 1 15016 use `test`; insert into t1 values( 239 )
master-bin.000001 15016 Query 1 15107 use `test`; insert into t1 values( 238 )
master-bin.000001 15107 Query 1 15198 use `test`; insert into t1 values( 237 )
master-bin.000001 15198 Query 1 15289 use `test`; insert into t1 values( 236 )
master-bin.000001 15289 Query 1 15380 use `test`; insert into t1 values( 235 )
master-bin.000001 15380 Query 1 15471 use `test`; insert into t1 values( 234 )
master-bin.000001 15471 Query 1 15562 use `test`; insert into t1 values( 233 )
master-bin.000001 15562 Query 1 15653 use `test`; insert into t1 values( 232 )
master-bin.000001 15653 Query 1 15744 use `test`; insert into t1 values( 231 )
master-bin.000001 15744 Query 1 15835 use `test`; insert into t1 values( 230 )
master-bin.000001 15835 Query 1 15926 use `test`; insert into t1 values( 229 )
master-bin.000001 15926 Query 1 16017 use `test`; insert into t1 values( 228 )
master-bin.000001 16017 Query 1 16108 use `test`; insert into t1 values( 227 )
master-bin.000001 16108 Query 1 16199 use `test`; insert into t1 values( 226 )
master-bin.000001 16199 Query 1 16290 use `test`; insert into t1 values( 225 )
master-bin.000001 16290 Query 1 16381 use `test`; insert into t1 values( 224 )
master-bin.000001 16381 Query 1 16472 use `test`; insert into t1 values( 223 )
master-bin.000001 16472 Query 1 16563 use `test`; insert into t1 values( 222 )
master-bin.000001 16563 Query 1 16654 use `test`; insert into t1 values( 221 )
master-bin.000001 16654 Query 1 16745 use `test`; insert into t1 values( 220 )
master-bin.000001 16745 Query 1 16836 use `test`; insert into t1 values( 219 )
master-bin.000001 16836 Query 1 16927 use `test`; insert into t1 values( 218 )
master-bin.000001 16927 Query 1 17018 use `test`; insert into t1 values( 217 )
master-bin.000001 17018 Query 1 17109 use `test`; insert into t1 values( 216 )
master-bin.000001 17109 Query 1 17200 use `test`; insert into t1 values( 215 )
master-bin.000001 17200 Query 1 17291 use `test`; insert into t1 values( 214 )
master-bin.000001 17291 Query 1 17382 use `test`; insert into t1 values( 213 )
master-bin.000001 17382 Query 1 17473 use `test`; insert into t1 values( 212 )
master-bin.000001 17473 Query 1 17564 use `test`; insert into t1 values( 211 )
master-bin.000001 17564 Query 1 17655 use `test`; insert into t1 values( 210 )
master-bin.000001 17655 Query 1 17746 use `test`; insert into t1 values( 209 )
master-bin.000001 17746 Query 1 17837 use `test`; insert into t1 values( 208 )
master-bin.000001 17837 Query 1 17928 use `test`; insert into t1 values( 207 )
master-bin.000001 17928 Query 1 18019 use `test`; insert into t1 values( 206 )
master-bin.000001 18019 Query 1 18110 use `test`; insert into t1 values( 205 )
master-bin.000001 18110 Query 1 18201 use `test`; insert into t1 values( 204 )
master-bin.000001 18201 Query 1 18292 use `test`; insert into t1 values( 203 )
master-bin.000001 18292 Query 1 18383 use `test`; insert into t1 values( 202 )
master-bin.000001 18383 Query 1 18474 use `test`; insert into t1 values( 201 )
master-bin.000001 18474 Query 1 18565 use `test`; insert into t1 values( 200 )
master-bin.000001 18565 Query 1 18656 use `test`; insert into t1 values( 199 )
master-bin.000001 18656 Query 1 18747 use `test`; insert into t1 values( 198 )
master-bin.000001 18747 Query 1 18838 use `test`; insert into t1 values( 197 )
master-bin.000001 18838 Query 1 18929 use `test`; insert into t1 values( 196 )
master-bin.000001 18929 Query 1 19020 use `test`; insert into t1 values( 195 )
master-bin.000001 19020 Query 1 19111 use `test`; insert into t1 values( 194 )
master-bin.000001 19111 Query 1 19202 use `test`; insert into t1 values( 193 )
master-bin.000001 19202 Query 1 19293 use `test`; insert into t1 values( 192 )
master-bin.000001 19293 Query 1 19384 use `test`; insert into t1 values( 191 )
master-bin.000001 19384 Query 1 19475 use `test`; insert into t1 values( 190 )
master-bin.000001 19475 Query 1 19566 use `test`; insert into t1 values( 189 )
master-bin.000001 19566 Query 1 19657 use `test`; insert into t1 values( 188 )
master-bin.000001 19657 Query 1 19748 use `test`; insert into t1 values( 187 )
master-bin.000001 19748 Query 1 19839 use `test`; insert into t1 values( 186 )
master-bin.000001 19839 Query 1 19930 use `test`; insert into t1 values( 185 )
master-bin.000001 19930 Query 1 20021 use `test`; insert into t1 values( 184 )
master-bin.000001 20021 Query 1 20112 use `test`; insert into t1 values( 183 )
master-bin.000001 20112 Query 1 20203 use `test`; insert into t1 values( 182 )
master-bin.000001 20203 Query 1 20294 use `test`; insert into t1 values( 181 )
master-bin.000001 20294 Query 1 20385 use `test`; insert into t1 values( 180 )
master-bin.000001 20385 Query 1 20476 use `test`; insert into t1 values( 179 )
master-bin.000001 20476 Query 1 20567 use `test`; insert into t1 values( 178 )
master-bin.000001 20567 Query 1 20658 use `test`; insert into t1 values( 177 )
master-bin.000001 20658 Query 1 20749 use `test`; insert into t1 values( 176 )
master-bin.000001 20749 Query 1 20840 use `test`; insert into t1 values( 175 )
master-bin.000001 20840 Query 1 20931 use `test`; insert into t1 values( 174 )
master-bin.000001 20931 Query 1 21022 use `test`; insert into t1 values( 173 )
master-bin.000001 21022 Query 1 21113 use `test`; insert into t1 values( 172 )
master-bin.000001 21113 Query 1 21204 use `test`; insert into t1 values( 171 )
master-bin.000001 21204 Query 1 21295 use `test`; insert into t1 values( 170 )
master-bin.000001 21295 Query 1 21386 use `test`; insert into t1 values( 169 )
master-bin.000001 21386 Query 1 21477 use `test`; insert into t1 values( 168 )
master-bin.000001 21477 Query 1 21568 use `test`; insert into t1 values( 167 )
master-bin.000001 21568 Query 1 21659 use `test`; insert into t1 values( 166 )
master-bin.000001 21659 Query 1 21750 use `test`; insert into t1 values( 165 )
master-bin.000001 21750 Query 1 21841 use `test`; insert into t1 values( 164 )
master-bin.000001 21841 Query 1 21932 use `test`; insert into t1 values( 163 )
master-bin.000001 21932 Query 1 22023 use `test`; insert into t1 values( 162 )
master-bin.000001 22023 Query 1 22114 use `test`; insert into t1 values( 161 )
master-bin.000001 22114 Query 1 22205 use `test`; insert into t1 values( 160 )
master-bin.000001 22205 Query 1 22296 use `test`; insert into t1 values( 159 )
master-bin.000001 22296 Query 1 22387 use `test`; insert into t1 values( 158 )
master-bin.000001 22387 Query 1 22478 use `test`; insert into t1 values( 157 )
master-bin.000001 22478 Query 1 22569 use `test`; insert into t1 values( 156 )
master-bin.000001 22569 Query 1 22660 use `test`; insert into t1 values( 155 )
master-bin.000001 22660 Query 1 22751 use `test`; insert into t1 values( 154 )
master-bin.000001 22751 Query 1 22842 use `test`; insert into t1 values( 153 )
master-bin.000001 22842 Query 1 22933 use `test`; insert into t1 values( 152 )
master-bin.000001 22933 Query 1 23024 use `test`; insert into t1 values( 151 )
master-bin.000001 23024 Query 1 23115 use `test`; insert into t1 values( 150 )
master-bin.000001 23115 Query 1 23206 use `test`; insert into t1 values( 149 )
master-bin.000001 23206 Query 1 23297 use `test`; insert into t1 values( 148 )
master-bin.000001 23297 Query 1 23388 use `test`; insert into t1 values( 147 )
master-bin.000001 23388 Query 1 23479 use `test`; insert into t1 values( 146 )
master-bin.000001 23479 Query 1 23570 use `test`; insert into t1 values( 145 )
master-bin.000001 23570 Query 1 23661 use `test`; insert into t1 values( 144 )
master-bin.000001 23661 Query 1 23752 use `test`; insert into t1 values( 143 )
master-bin.000001 23752 Query 1 23843 use `test`; insert into t1 values( 142 )
master-bin.000001 23843 Query 1 23934 use `test`; insert into t1 values( 141 )
master-bin.000001 23934 Query 1 24025 use `test`; insert into t1 values( 140 )
master-bin.000001 24025 Query 1 24116 use `test`; insert into t1 values( 139 )
master-bin.000001 24116 Query 1 24207 use `test`; insert into t1 values( 138 )
master-bin.000001 24207 Query 1 24298 use `test`; insert into t1 values( 137 )
master-bin.000001 24298 Query 1 24389 use `test`; insert into t1 values( 136 )
master-bin.000001 24389 Query 1 24480 use `test`; insert into t1 values( 135 )
master-bin.000001 24480 Query 1 24571 use `test`; insert into t1 values( 134 )
master-bin.000001 24571 Query 1 24662 use `test`; insert into t1 values( 133 )
master-bin.000001 24662 Query 1 24753 use `test`; insert into t1 values( 132 )
master-bin.000001 24753 Query 1 24844 use `test`; insert into t1 values( 131 )
master-bin.000001 24844 Query 1 24935 use `test`; insert into t1 values( 130 )
master-bin.000001 24935 Query 1 25026 use `test`; insert into t1 values( 129 )
master-bin.000001 25026 Query 1 25117 use `test`; insert into t1 values( 128 )
master-bin.000001 25117 Query 1 25208 use `test`; insert into t1 values( 127 )
master-bin.000001 25208 Query 1 25299 use `test`; insert into t1 values( 126 )
master-bin.000001 25299 Query 1 25390 use `test`; insert into t1 values( 125 )
master-bin.000001 25390 Query 1 25481 use `test`; insert into t1 values( 124 )
master-bin.000001 25481 Query 1 25572 use `test`; insert into t1 values( 123 )
master-bin.000001 25572 Query 1 25663 use `test`; insert into t1 values( 122 )
master-bin.000001 25663 Query 1 25754 use `test`; insert into t1 values( 121 )
master-bin.000001 25754 Query 1 25845 use `test`; insert into t1 values( 120 )
master-bin.000001 25845 Query 1 25936 use `test`; insert into t1 values( 119 )
master-bin.000001 25936 Query 1 26027 use `test`; insert into t1 values( 118 )
master-bin.000001 26027 Query 1 26118 use `test`; insert into t1 values( 117 )
master-bin.000001 26118 Query 1 26209 use `test`; insert into t1 values( 116 )
master-bin.000001 26209 Query 1 26300 use `test`; insert into t1 values( 115 )
master-bin.000001 26300 Query 1 26391 use `test`; insert into t1 values( 114 )
master-bin.000001 26391 Query 1 26482 use `test`; insert into t1 values( 113 )
master-bin.000001 26482 Query 1 26573 use `test`; insert into t1 values( 112 )
master-bin.000001 26573 Query 1 26664 use `test`; insert into t1 values( 111 )
master-bin.000001 26664 Query 1 26755 use `test`; insert into t1 values( 110 )
master-bin.000001 26755 Query 1 26846 use `test`; insert into t1 values( 109 )
master-bin.000001 26846 Query 1 26937 use `test`; insert into t1 values( 108 )
master-bin.000001 26937 Query 1 27028 use `test`; insert into t1 values( 107 )
master-bin.000001 27028 Query 1 27119 use `test`; insert into t1 values( 106 )
master-bin.000001 27119 Query 1 27210 use `test`; insert into t1 values( 105 )
master-bin.000001 27210 Query 1 27301 use `test`; insert into t1 values( 104 )
master-bin.000001 27301 Query 1 27392 use `test`; insert into t1 values( 103 )
master-bin.000001 27392 Query 1 27483 use `test`; insert into t1 values( 102 )
master-bin.000001 27483 Query 1 27574 use `test`; insert into t1 values( 101 )
master-bin.000001 27574 Query 1 27665 use `test`; insert into t1 values( 100 )
master-bin.000001 27665 Query 1 27755 use `test`; insert into t1 values( 99 )
master-bin.000001 27755 Query 1 27845 use `test`; insert into t1 values( 98 )
master-bin.000001 27845 Query 1 27935 use `test`; insert into t1 values( 97 )
master-bin.000001 27935 Query 1 28025 use `test`; insert into t1 values( 96 )
master-bin.000001 28025 Query 1 28115 use `test`; insert into t1 values( 95 )
master-bin.000001 28115 Query 1 28205 use `test`; insert into t1 values( 94 )
master-bin.000001 28205 Query 1 28295 use `test`; insert into t1 values( 93 )
master-bin.000001 28295 Query 1 28385 use `test`; insert into t1 values( 92 )
master-bin.000001 28385 Query 1 28475 use `test`; insert into t1 values( 91 )
master-bin.000001 28475 Query 1 28565 use `test`; insert into t1 values( 90 )
master-bin.000001 28565 Query 1 28655 use `test`; insert into t1 values( 89 )
master-bin.000001 28655 Query 1 28745 use `test`; insert into t1 values( 88 )
master-bin.000001 28745 Query 1 28835 use `test`; insert into t1 values( 87 )
master-bin.000001 28835 Query 1 28925 use `test`; insert into t1 values( 86 )
master-bin.000001 28925 Query 1 29015 use `test`; insert into t1 values( 85 )
master-bin.000001 29015 Query 1 29105 use `test`; insert into t1 values( 84 )
master-bin.000001 29105 Query 1 29195 use `test`; insert into t1 values( 83 )
master-bin.000001 29195 Query 1 29285 use `test`; insert into t1 values( 82 )
master-bin.000001 29285 Query 1 29375 use `test`; insert into t1 values( 81 )
master-bin.000001 29375 Query 1 29465 use `test`; insert into t1 values( 80 )
master-bin.000001 29465 Query 1 29555 use `test`; insert into t1 values( 79 )
master-bin.000001 29555 Query 1 29645 use `test`; insert into t1 values( 78 )
master-bin.000001 29645 Query 1 29735 use `test`; insert into t1 values( 77 )
master-bin.000001 29735 Query 1 29825 use `test`; insert into t1 values( 76 )
master-bin.000001 29825 Query 1 29915 use `test`; insert into t1 values( 75 )
master-bin.000001 29915 Query 1 30005 use `test`; insert into t1 values( 74 )
master-bin.000001 30005 Query 1 30095 use `test`; insert into t1 values( 73 )
master-bin.000001 30095 Query 1 30185 use `test`; insert into t1 values( 72 )
master-bin.000001 30185 Query 1 30275 use `test`; insert into t1 values( 71 )
master-bin.000001 30275 Query 1 30365 use `test`; insert into t1 values( 70 )
master-bin.000001 30365 Query 1 30455 use `test`; insert into t1 values( 69 )
master-bin.000001 30455 Query 1 30545 use `test`; insert into t1 values( 68 )
master-bin.000001 30545 Query 1 30635 use `test`; insert into t1 values( 67 )
master-bin.000001 30635 Query 1 30725 use `test`; insert into t1 values( 66 )
master-bin.000001 30725 Query 1 30815 use `test`; insert into t1 values( 65 )
master-bin.000001 30815 Query 1 30905 use `test`; insert into t1 values( 64 )
master-bin.000001 30905 Query 1 30995 use `test`; insert into t1 values( 63 )
master-bin.000001 30995 Query 1 31085 use `test`; insert into t1 values( 62 )
master-bin.000001 31085 Query 1 31175 use `test`; insert into t1 values( 61 )
master-bin.000001 31175 Query 1 31265 use `test`; insert into t1 values( 60 )
master-bin.000001 31265 Query 1 31355 use `test`; insert into t1 values( 59 )
master-bin.000001 31355 Query 1 31445 use `test`; insert into t1 values( 58 )
master-bin.000001 31445 Query 1 31535 use `test`; insert into t1 values( 57 )
master-bin.000001 31535 Query 1 31625 use `test`; insert into t1 values( 56 )
master-bin.000001 31625 Query 1 31715 use `test`; insert into t1 values( 55 )
master-bin.000001 31715 Query 1 31805 use `test`; insert into t1 values( 54 )
master-bin.000001 31805 Query 1 31895 use `test`; insert into t1 values( 53 )
master-bin.000001 31895 Query 1 31985 use `test`; insert into t1 values( 52 )
master-bin.000001 31985 Query 1 32075 use `test`; insert into t1 values( 51 )
master-bin.000001 32075 Query 1 32165 use `test`; insert into t1 values( 50 )
master-bin.000001 32165 Query 1 32255 use `test`; insert into t1 values( 49 )
master-bin.000001 32255 Query 1 32345 use `test`; insert into t1 values( 48 )
master-bin.000001 32345 Query 1 32435 use `test`; insert into t1 values( 47 )
master-bin.000001 32435 Query 1 32525 use `test`; insert into t1 values( 46 )
master-bin.000001 32525 Query 1 32615 use `test`; insert into t1 values( 45 )
master-bin.000001 32615 Query 1 32705 use `test`; insert into t1 values( 44 )
master-bin.000001 32705 Query 1 32795 use `test`; insert into t1 values( 43 )
master-bin.000001 32795 Query 1 32885 use `test`; insert into t1 values( 42 )
master-bin.000001 32885 Query 1 32975 use `test`; insert into t1 values( 41 )
master-bin.000001 32975 Query 1 33065 use `test`; insert into t1 values( 40 )
master-bin.000001 33065 Query 1 33155 use `test`; insert into t1 values( 39 )
master-bin.000001 33155 Query 1 33245 use `test`; insert into t1 values( 38 )
master-bin.000001 33245 Query 1 33335 use `test`; insert into t1 values( 37 )
master-bin.000001 33335 Query 1 33425 use `test`; insert into t1 values( 36 )
master-bin.000001 33425 Query 1 33515 use `test`; insert into t1 values( 35 )
master-bin.000001 33515 Query 1 33605 use `test`; insert into t1 values( 34 )
master-bin.000001 33605 Query 1 33695 use `test`; insert into t1 values( 33 )
master-bin.000001 33695 Query 1 33785 use `test`; insert into t1 values( 32 )
master-bin.000001 33785 Query 1 33875 use `test`; insert into t1 values( 31 )
master-bin.000001 33875 Query 1 33965 use `test`; insert into t1 values( 30 )
master-bin.000001 33965 Query 1 34055 use `test`; insert into t1 values( 29 )
master-bin.000001 34055 Query 1 34145 use `test`; insert into t1 values( 28 )
master-bin.000001 34145 Query 1 34235 use `test`; insert into t1 values( 27 )
master-bin.000001 34235 Query 1 34325 use `test`; insert into t1 values( 26 )
master-bin.000001 34325 Query 1 34415 use `test`; insert into t1 values( 25 )
master-bin.000001 34415 Query 1 34505 use `test`; insert into t1 values( 24 )
master-bin.000001 34505 Query 1 34595 use `test`; insert into t1 values( 23 )
master-bin.000001 34595 Query 1 34685 use `test`; insert into t1 values( 22 )
master-bin.000001 34685 Query 1 34775 use `test`; insert into t1 values( 21 )
master-bin.000001 34775 Query 1 34865 use `test`; insert into t1 values( 20 )
master-bin.000001 34865 Query 1 34955 use `test`; insert into t1 values( 19 )
master-bin.000001 34955 Query 1 35045 use `test`; insert into t1 values( 18 )
master-bin.000001 35045 Query 1 35135 use `test`; insert into t1 values( 17 )
master-bin.000001 35135 Query 1 35225 use `test`; insert into t1 values( 16 )
master-bin.000001 35225 Query 1 35315 use `test`; insert into t1 values( 15 )
master-bin.000001 35315 Query 1 35405 use `test`; insert into t1 values( 14 )
master-bin.000001 35405 Query 1 35495 use `test`; insert into t1 values( 13 )
master-bin.000001 35495 Query 1 35585 use `test`; insert into t1 values( 12 )
master-bin.000001 35585 Query 1 35675 use `test`; insert into t1 values( 11 )
master-bin.000001 35675 Query 1 35765 use `test`; insert into t1 values( 10 )
master-bin.000001 35765 Query 1 35854 use `test`; insert into t1 values( 9 )
master-bin.000001 35854 Query 1 35943 use `test`; insert into t1 values( 8 )
master-bin.000001 35943 Query 1 36032 use `test`; insert into t1 values( 7 )
master-bin.000001 36032 Query 1 36121 use `test`; insert into t1 values( 6 )
master-bin.000001 36121 Query 1 36210 use `test`; insert into t1 values( 5 )
master-bin.000001 36210 Query 1 36299 use `test`; insert into t1 values( 4 )
master-bin.000001 36299 Query 1 36388 use `test`; insert into t1 values( 3 )
master-bin.000001 36388 Query 1 36477 use `test`; insert into t1 values( 2 )
master-bin.000001 36477 Query 1 36566 use `test`; insert into t1 values( 1 )
master-bin.000001 36566 Xid 1 36593 COMMIT /* XID */
master-bin.000001 36593 Rotate 1 36637 master-bin.000002;pos=4
master-bin.000001 4 Format_desc 1 107 Server version, Binlog ver: 4
master-bin.000001 107 Query 1 207 use `test`; create table t1 (a int) engine=innodb
master-bin.000001 207 Query 1 275 BEGIN
master-bin.000001 275 Query 1 366 use `test`; insert into t1 values( 400 )
master-bin.000001 366 Query 1 457 use `test`; insert into t1 values( 399 )
master-bin.000001 457 Query 1 548 use `test`; insert into t1 values( 398 )
master-bin.000001 548 Query 1 639 use `test`; insert into t1 values( 397 )
master-bin.000001 639 Query 1 730 use `test`; insert into t1 values( 396 )
master-bin.000001 730 Query 1 821 use `test`; insert into t1 values( 395 )
master-bin.000001 821 Query 1 912 use `test`; insert into t1 values( 394 )
master-bin.000001 912 Query 1 1003 use `test`; insert into t1 values( 393 )
master-bin.000001 1003 Query 1 1094 use `test`; insert into t1 values( 392 )
master-bin.000001 1094 Query 1 1185 use `test`; insert into t1 values( 391 )
master-bin.000001 1185 Query 1 1276 use `test`; insert into t1 values( 390 )
master-bin.000001 1276 Query 1 1367 use `test`; insert into t1 values( 389 )
master-bin.000001 1367 Query 1 1458 use `test`; insert into t1 values( 388 )
master-bin.000001 1458 Query 1 1549 use `test`; insert into t1 values( 387 )
master-bin.000001 1549 Query 1 1640 use `test`; insert into t1 values( 386 )
master-bin.000001 1640 Query 1 1731 use `test`; insert into t1 values( 385 )
master-bin.000001 1731 Query 1 1822 use `test`; insert into t1 values( 384 )
master-bin.000001 1822 Query 1 1913 use `test`; insert into t1 values( 383 )
master-bin.000001 1913 Query 1 2004 use `test`; insert into t1 values( 382 )
master-bin.000001 2004 Query 1 2095 use `test`; insert into t1 values( 381 )
master-bin.000001 2095 Query 1 2186 use `test`; insert into t1 values( 380 )
master-bin.000001 2186 Query 1 2277 use `test`; insert into t1 values( 379 )
master-bin.000001 2277 Query 1 2368 use `test`; insert into t1 values( 378 )
master-bin.000001 2368 Query 1 2459 use `test`; insert into t1 values( 377 )
master-bin.000001 2459 Query 1 2550 use `test`; insert into t1 values( 376 )
master-bin.000001 2550 Query 1 2641 use `test`; insert into t1 values( 375 )
master-bin.000001 2641 Query 1 2732 use `test`; insert into t1 values( 374 )
master-bin.000001 2732 Query 1 2823 use `test`; insert into t1 values( 373 )
master-bin.000001 2823 Query 1 2914 use `test`; insert into t1 values( 372 )
master-bin.000001 2914 Query 1 3005 use `test`; insert into t1 values( 371 )
master-bin.000001 3005 Query 1 3096 use `test`; insert into t1 values( 370 )
master-bin.000001 3096 Query 1 3187 use `test`; insert into t1 values( 369 )
master-bin.000001 3187 Query 1 3278 use `test`; insert into t1 values( 368 )
master-bin.000001 3278 Query 1 3369 use `test`; insert into t1 values( 367 )
master-bin.000001 3369 Query 1 3460 use `test`; insert into t1 values( 366 )
master-bin.000001 3460 Query 1 3551 use `test`; insert into t1 values( 365 )
master-bin.000001 3551 Query 1 3642 use `test`; insert into t1 values( 364 )
master-bin.000001 3642 Query 1 3733 use `test`; insert into t1 values( 363 )
master-bin.000001 3733 Query 1 3824 use `test`; insert into t1 values( 362 )
master-bin.000001 3824 Query 1 3915 use `test`; insert into t1 values( 361 )
master-bin.000001 3915 Query 1 4006 use `test`; insert into t1 values( 360 )
master-bin.000001 4006 Query 1 4097 use `test`; insert into t1 values( 359 )
master-bin.000001 4097 Query 1 4188 use `test`; insert into t1 values( 358 )
master-bin.000001 4188 Query 1 4279 use `test`; insert into t1 values( 357 )
master-bin.000001 4279 Query 1 4370 use `test`; insert into t1 values( 356 )
master-bin.000001 4370 Query 1 4461 use `test`; insert into t1 values( 355 )
master-bin.000001 4461 Query 1 4552 use `test`; insert into t1 values( 354 )
master-bin.000001 4552 Query 1 4643 use `test`; insert into t1 values( 353 )
master-bin.000001 4643 Query 1 4734 use `test`; insert into t1 values( 352 )
master-bin.000001 4734 Query 1 4825 use `test`; insert into t1 values( 351 )
master-bin.000001 4825 Query 1 4916 use `test`; insert into t1 values( 350 )
master-bin.000001 4916 Query 1 5007 use `test`; insert into t1 values( 349 )
master-bin.000001 5007 Query 1 5098 use `test`; insert into t1 values( 348 )
master-bin.000001 5098 Query 1 5189 use `test`; insert into t1 values( 347 )
master-bin.000001 5189 Query 1 5280 use `test`; insert into t1 values( 346 )
master-bin.000001 5280 Query 1 5371 use `test`; insert into t1 values( 345 )
master-bin.000001 5371 Query 1 5462 use `test`; insert into t1 values( 344 )
master-bin.000001 5462 Query 1 5553 use `test`; insert into t1 values( 343 )
master-bin.000001 5553 Query 1 5644 use `test`; insert into t1 values( 342 )
master-bin.000001 5644 Query 1 5735 use `test`; insert into t1 values( 341 )
master-bin.000001 5735 Query 1 5826 use `test`; insert into t1 values( 340 )
master-bin.000001 5826 Query 1 5917 use `test`; insert into t1 values( 339 )
master-bin.000001 5917 Query 1 6008 use `test`; insert into t1 values( 338 )
master-bin.000001 6008 Query 1 6099 use `test`; insert into t1 values( 337 )
master-bin.000001 6099 Query 1 6190 use `test`; insert into t1 values( 336 )
master-bin.000001 6190 Query 1 6281 use `test`; insert into t1 values( 335 )
master-bin.000001 6281 Query 1 6372 use `test`; insert into t1 values( 334 )
master-bin.000001 6372 Query 1 6463 use `test`; insert into t1 values( 333 )
master-bin.000001 6463 Query 1 6554 use `test`; insert into t1 values( 332 )
master-bin.000001 6554 Query 1 6645 use `test`; insert into t1 values( 331 )
master-bin.000001 6645 Query 1 6736 use `test`; insert into t1 values( 330 )
master-bin.000001 6736 Query 1 6827 use `test`; insert into t1 values( 329 )
master-bin.000001 6827 Query 1 6918 use `test`; insert into t1 values( 328 )
master-bin.000001 6918 Query 1 7009 use `test`; insert into t1 values( 327 )
master-bin.000001 7009 Query 1 7100 use `test`; insert into t1 values( 326 )
master-bin.000001 7100 Query 1 7191 use `test`; insert into t1 values( 325 )
master-bin.000001 7191 Query 1 7282 use `test`; insert into t1 values( 324 )
master-bin.000001 7282 Query 1 7373 use `test`; insert into t1 values( 323 )
master-bin.000001 7373 Query 1 7464 use `test`; insert into t1 values( 322 )
master-bin.000001 7464 Query 1 7555 use `test`; insert into t1 values( 321 )
master-bin.000001 7555 Query 1 7646 use `test`; insert into t1 values( 320 )
master-bin.000001 7646 Query 1 7737 use `test`; insert into t1 values( 319 )
master-bin.000001 7737 Query 1 7828 use `test`; insert into t1 values( 318 )
master-bin.000001 7828 Query 1 7919 use `test`; insert into t1 values( 317 )
master-bin.000001 7919 Query 1 8010 use `test`; insert into t1 values( 316 )
master-bin.000001 8010 Query 1 8101 use `test`; insert into t1 values( 315 )
master-bin.000001 8101 Query 1 8192 use `test`; insert into t1 values( 314 )
master-bin.000001 8192 Query 1 8283 use `test`; insert into t1 values( 313 )
master-bin.000001 8283 Query 1 8374 use `test`; insert into t1 values( 312 )
master-bin.000001 8374 Query 1 8465 use `test`; insert into t1 values( 311 )
master-bin.000001 8465 Query 1 8556 use `test`; insert into t1 values( 310 )
master-bin.000001 8556 Query 1 8647 use `test`; insert into t1 values( 309 )
master-bin.000001 8647 Query 1 8738 use `test`; insert into t1 values( 308 )
master-bin.000001 8738 Query 1 8829 use `test`; insert into t1 values( 307 )
master-bin.000001 8829 Query 1 8920 use `test`; insert into t1 values( 306 )
master-bin.000001 8920 Query 1 9011 use `test`; insert into t1 values( 305 )
master-bin.000001 9011 Query 1 9102 use `test`; insert into t1 values( 304 )
master-bin.000001 9102 Query 1 9193 use `test`; insert into t1 values( 303 )
master-bin.000001 9193 Query 1 9284 use `test`; insert into t1 values( 302 )
master-bin.000001 9284 Query 1 9375 use `test`; insert into t1 values( 301 )
master-bin.000001 9375 Query 1 9466 use `test`; insert into t1 values( 300 )
master-bin.000001 9466 Query 1 9557 use `test`; insert into t1 values( 299 )
master-bin.000001 9557 Query 1 9648 use `test`; insert into t1 values( 298 )
master-bin.000001 9648 Query 1 9739 use `test`; insert into t1 values( 297 )
master-bin.000001 9739 Query 1 9830 use `test`; insert into t1 values( 296 )
master-bin.000001 9830 Query 1 9921 use `test`; insert into t1 values( 295 )
master-bin.000001 9921 Query 1 10012 use `test`; insert into t1 values( 294 )
master-bin.000001 10012 Query 1 10103 use `test`; insert into t1 values( 293 )
master-bin.000001 10103 Query 1 10194 use `test`; insert into t1 values( 292 )
master-bin.000001 10194 Query 1 10285 use `test`; insert into t1 values( 291 )
master-bin.000001 10285 Query 1 10376 use `test`; insert into t1 values( 290 )
master-bin.000001 10376 Query 1 10467 use `test`; insert into t1 values( 289 )
master-bin.000001 10467 Query 1 10558 use `test`; insert into t1 values( 288 )
master-bin.000001 10558 Query 1 10649 use `test`; insert into t1 values( 287 )
master-bin.000001 10649 Query 1 10740 use `test`; insert into t1 values( 286 )
master-bin.000001 10740 Query 1 10831 use `test`; insert into t1 values( 285 )
master-bin.000001 10831 Query 1 10922 use `test`; insert into t1 values( 284 )
master-bin.000001 10922 Query 1 11013 use `test`; insert into t1 values( 283 )
master-bin.000001 11013 Query 1 11104 use `test`; insert into t1 values( 282 )
master-bin.000001 11104 Query 1 11195 use `test`; insert into t1 values( 281 )
master-bin.000001 11195 Query 1 11286 use `test`; insert into t1 values( 280 )
master-bin.000001 11286 Query 1 11377 use `test`; insert into t1 values( 279 )
master-bin.000001 11377 Query 1 11468 use `test`; insert into t1 values( 278 )
master-bin.000001 11468 Query 1 11559 use `test`; insert into t1 values( 277 )
master-bin.000001 11559 Query 1 11650 use `test`; insert into t1 values( 276 )
master-bin.000001 11650 Query 1 11741 use `test`; insert into t1 values( 275 )
master-bin.000001 11741 Query 1 11832 use `test`; insert into t1 values( 274 )
master-bin.000001 11832 Query 1 11923 use `test`; insert into t1 values( 273 )
master-bin.000001 11923 Query 1 12014 use `test`; insert into t1 values( 272 )
master-bin.000001 12014 Query 1 12105 use `test`; insert into t1 values( 271 )
master-bin.000001 12105 Query 1 12196 use `test`; insert into t1 values( 270 )
master-bin.000001 12196 Query 1 12287 use `test`; insert into t1 values( 269 )
master-bin.000001 12287 Query 1 12378 use `test`; insert into t1 values( 268 )
master-bin.000001 12378 Query 1 12469 use `test`; insert into t1 values( 267 )
master-bin.000001 12469 Query 1 12560 use `test`; insert into t1 values( 266 )
master-bin.000001 12560 Query 1 12651 use `test`; insert into t1 values( 265 )
master-bin.000001 12651 Query 1 12742 use `test`; insert into t1 values( 264 )
master-bin.000001 12742 Query 1 12833 use `test`; insert into t1 values( 263 )
master-bin.000001 12833 Query 1 12924 use `test`; insert into t1 values( 262 )
master-bin.000001 12924 Query 1 13015 use `test`; insert into t1 values( 261 )
master-bin.000001 13015 Query 1 13106 use `test`; insert into t1 values( 260 )
master-bin.000001 13106 Query 1 13197 use `test`; insert into t1 values( 259 )
master-bin.000001 13197 Query 1 13288 use `test`; insert into t1 values( 258 )
master-bin.000001 13288 Query 1 13379 use `test`; insert into t1 values( 257 )
master-bin.000001 13379 Query 1 13470 use `test`; insert into t1 values( 256 )
master-bin.000001 13470 Query 1 13561 use `test`; insert into t1 values( 255 )
master-bin.000001 13561 Query 1 13652 use `test`; insert into t1 values( 254 )
master-bin.000001 13652 Query 1 13743 use `test`; insert into t1 values( 253 )
master-bin.000001 13743 Query 1 13834 use `test`; insert into t1 values( 252 )
master-bin.000001 13834 Query 1 13925 use `test`; insert into t1 values( 251 )
master-bin.000001 13925 Query 1 14016 use `test`; insert into t1 values( 250 )
master-bin.000001 14016 Query 1 14107 use `test`; insert into t1 values( 249 )
master-bin.000001 14107 Query 1 14198 use `test`; insert into t1 values( 248 )
master-bin.000001 14198 Query 1 14289 use `test`; insert into t1 values( 247 )
master-bin.000001 14289 Query 1 14380 use `test`; insert into t1 values( 246 )
master-bin.000001 14380 Query 1 14471 use `test`; insert into t1 values( 245 )
master-bin.000001 14471 Query 1 14562 use `test`; insert into t1 values( 244 )
master-bin.000001 14562 Query 1 14653 use `test`; insert into t1 values( 243 )
master-bin.000001 14653 Query 1 14744 use `test`; insert into t1 values( 242 )
master-bin.000001 14744 Query 1 14835 use `test`; insert into t1 values( 241 )
master-bin.000001 14835 Query 1 14926 use `test`; insert into t1 values( 240 )
master-bin.000001 14926 Query 1 15017 use `test`; insert into t1 values( 239 )
master-bin.000001 15017 Query 1 15108 use `test`; insert into t1 values( 238 )
master-bin.000001 15108 Query 1 15199 use `test`; insert into t1 values( 237 )
master-bin.000001 15199 Query 1 15290 use `test`; insert into t1 values( 236 )
master-bin.000001 15290 Query 1 15381 use `test`; insert into t1 values( 235 )
master-bin.000001 15381 Query 1 15472 use `test`; insert into t1 values( 234 )
master-bin.000001 15472 Query 1 15563 use `test`; insert into t1 values( 233 )
master-bin.000001 15563 Query 1 15654 use `test`; insert into t1 values( 232 )
master-bin.000001 15654 Query 1 15745 use `test`; insert into t1 values( 231 )
master-bin.000001 15745 Query 1 15836 use `test`; insert into t1 values( 230 )
master-bin.000001 15836 Query 1 15927 use `test`; insert into t1 values( 229 )
master-bin.000001 15927 Query 1 16018 use `test`; insert into t1 values( 228 )
master-bin.000001 16018 Query 1 16109 use `test`; insert into t1 values( 227 )
master-bin.000001 16109 Query 1 16200 use `test`; insert into t1 values( 226 )
master-bin.000001 16200 Query 1 16291 use `test`; insert into t1 values( 225 )
master-bin.000001 16291 Query 1 16382 use `test`; insert into t1 values( 224 )
master-bin.000001 16382 Query 1 16473 use `test`; insert into t1 values( 223 )
master-bin.000001 16473 Query 1 16564 use `test`; insert into t1 values( 222 )
master-bin.000001 16564 Query 1 16655 use `test`; insert into t1 values( 221 )
master-bin.000001 16655 Query 1 16746 use `test`; insert into t1 values( 220 )
master-bin.000001 16746 Query 1 16837 use `test`; insert into t1 values( 219 )
master-bin.000001 16837 Query 1 16928 use `test`; insert into t1 values( 218 )
master-bin.000001 16928 Query 1 17019 use `test`; insert into t1 values( 217 )
master-bin.000001 17019 Query 1 17110 use `test`; insert into t1 values( 216 )
master-bin.000001 17110 Query 1 17201 use `test`; insert into t1 values( 215 )
master-bin.000001 17201 Query 1 17292 use `test`; insert into t1 values( 214 )
master-bin.000001 17292 Query 1 17383 use `test`; insert into t1 values( 213 )
master-bin.000001 17383 Query 1 17474 use `test`; insert into t1 values( 212 )
master-bin.000001 17474 Query 1 17565 use `test`; insert into t1 values( 211 )
master-bin.000001 17565 Query 1 17656 use `test`; insert into t1 values( 210 )
master-bin.000001 17656 Query 1 17747 use `test`; insert into t1 values( 209 )
master-bin.000001 17747 Query 1 17838 use `test`; insert into t1 values( 208 )
master-bin.000001 17838 Query 1 17929 use `test`; insert into t1 values( 207 )
master-bin.000001 17929 Query 1 18020 use `test`; insert into t1 values( 206 )
master-bin.000001 18020 Query 1 18111 use `test`; insert into t1 values( 205 )
master-bin.000001 18111 Query 1 18202 use `test`; insert into t1 values( 204 )
master-bin.000001 18202 Query 1 18293 use `test`; insert into t1 values( 203 )
master-bin.000001 18293 Query 1 18384 use `test`; insert into t1 values( 202 )
master-bin.000001 18384 Query 1 18475 use `test`; insert into t1 values( 201 )
master-bin.000001 18475 Query 1 18566 use `test`; insert into t1 values( 200 )
master-bin.000001 18566 Query 1 18657 use `test`; insert into t1 values( 199 )
master-bin.000001 18657 Query 1 18748 use `test`; insert into t1 values( 198 )
master-bin.000001 18748 Query 1 18839 use `test`; insert into t1 values( 197 )
master-bin.000001 18839 Query 1 18930 use `test`; insert into t1 values( 196 )
master-bin.000001 18930 Query 1 19021 use `test`; insert into t1 values( 195 )
master-bin.000001 19021 Query 1 19112 use `test`; insert into t1 values( 194 )
master-bin.000001 19112 Query 1 19203 use `test`; insert into t1 values( 193 )
master-bin.000001 19203 Query 1 19294 use `test`; insert into t1 values( 192 )
master-bin.000001 19294 Query 1 19385 use `test`; insert into t1 values( 191 )
master-bin.000001 19385 Query 1 19476 use `test`; insert into t1 values( 190 )
master-bin.000001 19476 Query 1 19567 use `test`; insert into t1 values( 189 )
master-bin.000001 19567 Query 1 19658 use `test`; insert into t1 values( 188 )
master-bin.000001 19658 Query 1 19749 use `test`; insert into t1 values( 187 )
master-bin.000001 19749 Query 1 19840 use `test`; insert into t1 values( 186 )
master-bin.000001 19840 Query 1 19931 use `test`; insert into t1 values( 185 )
master-bin.000001 19931 Query 1 20022 use `test`; insert into t1 values( 184 )
master-bin.000001 20022 Query 1 20113 use `test`; insert into t1 values( 183 )
master-bin.000001 20113 Query 1 20204 use `test`; insert into t1 values( 182 )
master-bin.000001 20204 Query 1 20295 use `test`; insert into t1 values( 181 )
master-bin.000001 20295 Query 1 20386 use `test`; insert into t1 values( 180 )
master-bin.000001 20386 Query 1 20477 use `test`; insert into t1 values( 179 )
master-bin.000001 20477 Query 1 20568 use `test`; insert into t1 values( 178 )
master-bin.000001 20568 Query 1 20659 use `test`; insert into t1 values( 177 )
master-bin.000001 20659 Query 1 20750 use `test`; insert into t1 values( 176 )
master-bin.000001 20750 Query 1 20841 use `test`; insert into t1 values( 175 )
master-bin.000001 20841 Query 1 20932 use `test`; insert into t1 values( 174 )
master-bin.000001 20932 Query 1 21023 use `test`; insert into t1 values( 173 )
master-bin.000001 21023 Query 1 21114 use `test`; insert into t1 values( 172 )
master-bin.000001 21114 Query 1 21205 use `test`; insert into t1 values( 171 )
master-bin.000001 21205 Query 1 21296 use `test`; insert into t1 values( 170 )
master-bin.000001 21296 Query 1 21387 use `test`; insert into t1 values( 169 )
master-bin.000001 21387 Query 1 21478 use `test`; insert into t1 values( 168 )
master-bin.000001 21478 Query 1 21569 use `test`; insert into t1 values( 167 )
master-bin.000001 21569 Query 1 21660 use `test`; insert into t1 values( 166 )
master-bin.000001 21660 Query 1 21751 use `test`; insert into t1 values( 165 )
master-bin.000001 21751 Query 1 21842 use `test`; insert into t1 values( 164 )
master-bin.000001 21842 Query 1 21933 use `test`; insert into t1 values( 163 )
master-bin.000001 21933 Query 1 22024 use `test`; insert into t1 values( 162 )
master-bin.000001 22024 Query 1 22115 use `test`; insert into t1 values( 161 )
master-bin.000001 22115 Query 1 22206 use `test`; insert into t1 values( 160 )
master-bin.000001 22206 Query 1 22297 use `test`; insert into t1 values( 159 )
master-bin.000001 22297 Query 1 22388 use `test`; insert into t1 values( 158 )
master-bin.000001 22388 Query 1 22479 use `test`; insert into t1 values( 157 )
master-bin.000001 22479 Query 1 22570 use `test`; insert into t1 values( 156 )
master-bin.000001 22570 Query 1 22661 use `test`; insert into t1 values( 155 )
master-bin.000001 22661 Query 1 22752 use `test`; insert into t1 values( 154 )
master-bin.000001 22752 Query 1 22843 use `test`; insert into t1 values( 153 )
master-bin.000001 22843 Query 1 22934 use `test`; insert into t1 values( 152 )
master-bin.000001 22934 Query 1 23025 use `test`; insert into t1 values( 151 )
master-bin.000001 23025 Query 1 23116 use `test`; insert into t1 values( 150 )
master-bin.000001 23116 Query 1 23207 use `test`; insert into t1 values( 149 )
master-bin.000001 23207 Query 1 23298 use `test`; insert into t1 values( 148 )
master-bin.000001 23298 Query 1 23389 use `test`; insert into t1 values( 147 )
master-bin.000001 23389 Query 1 23480 use `test`; insert into t1 values( 146 )
master-bin.000001 23480 Query 1 23571 use `test`; insert into t1 values( 145 )
master-bin.000001 23571 Query 1 23662 use `test`; insert into t1 values( 144 )
master-bin.000001 23662 Query 1 23753 use `test`; insert into t1 values( 143 )
master-bin.000001 23753 Query 1 23844 use `test`; insert into t1 values( 142 )
master-bin.000001 23844 Query 1 23935 use `test`; insert into t1 values( 141 )
master-bin.000001 23935 Query 1 24026 use `test`; insert into t1 values( 140 )
master-bin.000001 24026 Query 1 24117 use `test`; insert into t1 values( 139 )
master-bin.000001 24117 Query 1 24208 use `test`; insert into t1 values( 138 )
master-bin.000001 24208 Query 1 24299 use `test`; insert into t1 values( 137 )
master-bin.000001 24299 Query 1 24390 use `test`; insert into t1 values( 136 )
master-bin.000001 24390 Query 1 24481 use `test`; insert into t1 values( 135 )
master-bin.000001 24481 Query 1 24572 use `test`; insert into t1 values( 134 )
master-bin.000001 24572 Query 1 24663 use `test`; insert into t1 values( 133 )
master-bin.000001 24663 Query 1 24754 use `test`; insert into t1 values( 132 )
master-bin.000001 24754 Query 1 24845 use `test`; insert into t1 values( 131 )
master-bin.000001 24845 Query 1 24936 use `test`; insert into t1 values( 130 )
master-bin.000001 24936 Query 1 25027 use `test`; insert into t1 values( 129 )
master-bin.000001 25027 Query 1 25118 use `test`; insert into t1 values( 128 )
master-bin.000001 25118 Query 1 25209 use `test`; insert into t1 values( 127 )
master-bin.000001 25209 Query 1 25300 use `test`; insert into t1 values( 126 )
master-bin.000001 25300 Query 1 25391 use `test`; insert into t1 values( 125 )
master-bin.000001 25391 Query 1 25482 use `test`; insert into t1 values( 124 )
master-bin.000001 25482 Query 1 25573 use `test`; insert into t1 values( 123 )
master-bin.000001 25573 Query 1 25664 use `test`; insert into t1 values( 122 )
master-bin.000001 25664 Query 1 25755 use `test`; insert into t1 values( 121 )
master-bin.000001 25755 Query 1 25846 use `test`; insert into t1 values( 120 )
master-bin.000001 25846 Query 1 25937 use `test`; insert into t1 values( 119 )
master-bin.000001 25937 Query 1 26028 use `test`; insert into t1 values( 118 )
master-bin.000001 26028 Query 1 26119 use `test`; insert into t1 values( 117 )
master-bin.000001 26119 Query 1 26210 use `test`; insert into t1 values( 116 )
master-bin.000001 26210 Query 1 26301 use `test`; insert into t1 values( 115 )
master-bin.000001 26301 Query 1 26392 use `test`; insert into t1 values( 114 )
master-bin.000001 26392 Query 1 26483 use `test`; insert into t1 values( 113 )
master-bin.000001 26483 Query 1 26574 use `test`; insert into t1 values( 112 )
master-bin.000001 26574 Query 1 26665 use `test`; insert into t1 values( 111 )
master-bin.000001 26665 Query 1 26756 use `test`; insert into t1 values( 110 )
master-bin.000001 26756 Query 1 26847 use `test`; insert into t1 values( 109 )
master-bin.000001 26847 Query 1 26938 use `test`; insert into t1 values( 108 )
master-bin.000001 26938 Query 1 27029 use `test`; insert into t1 values( 107 )
master-bin.000001 27029 Query 1 27120 use `test`; insert into t1 values( 106 )
master-bin.000001 27120 Query 1 27211 use `test`; insert into t1 values( 105 )
master-bin.000001 27211 Query 1 27302 use `test`; insert into t1 values( 104 )
master-bin.000001 27302 Query 1 27393 use `test`; insert into t1 values( 103 )
master-bin.000001 27393 Query 1 27484 use `test`; insert into t1 values( 102 )
master-bin.000001 27484 Query 1 27575 use `test`; insert into t1 values( 101 )
master-bin.000001 27575 Query 1 27666 use `test`; insert into t1 values( 100 )
master-bin.000001 27666 Query 1 27756 use `test`; insert into t1 values( 99 )
master-bin.000001 27756 Query 1 27846 use `test`; insert into t1 values( 98 )
master-bin.000001 27846 Query 1 27936 use `test`; insert into t1 values( 97 )
master-bin.000001 27936 Query 1 28026 use `test`; insert into t1 values( 96 )
master-bin.000001 28026 Query 1 28116 use `test`; insert into t1 values( 95 )
master-bin.000001 28116 Query 1 28206 use `test`; insert into t1 values( 94 )
master-bin.000001 28206 Query 1 28296 use `test`; insert into t1 values( 93 )
master-bin.000001 28296 Query 1 28386 use `test`; insert into t1 values( 92 )
master-bin.000001 28386 Query 1 28476 use `test`; insert into t1 values( 91 )
master-bin.000001 28476 Query 1 28566 use `test`; insert into t1 values( 90 )
master-bin.000001 28566 Query 1 28656 use `test`; insert into t1 values( 89 )
master-bin.000001 28656 Query 1 28746 use `test`; insert into t1 values( 88 )
master-bin.000001 28746 Query 1 28836 use `test`; insert into t1 values( 87 )
master-bin.000001 28836 Query 1 28926 use `test`; insert into t1 values( 86 )
master-bin.000001 28926 Query 1 29016 use `test`; insert into t1 values( 85 )
master-bin.000001 29016 Query 1 29106 use `test`; insert into t1 values( 84 )
master-bin.000001 29106 Query 1 29196 use `test`; insert into t1 values( 83 )
master-bin.000001 29196 Query 1 29286 use `test`; insert into t1 values( 82 )
master-bin.000001 29286 Query 1 29376 use `test`; insert into t1 values( 81 )
master-bin.000001 29376 Query 1 29466 use `test`; insert into t1 values( 80 )
master-bin.000001 29466 Query 1 29556 use `test`; insert into t1 values( 79 )
master-bin.000001 29556 Query 1 29646 use `test`; insert into t1 values( 78 )
master-bin.000001 29646 Query 1 29736 use `test`; insert into t1 values( 77 )
master-bin.000001 29736 Query 1 29826 use `test`; insert into t1 values( 76 )
master-bin.000001 29826 Query 1 29916 use `test`; insert into t1 values( 75 )
master-bin.000001 29916 Query 1 30006 use `test`; insert into t1 values( 74 )
master-bin.000001 30006 Query 1 30096 use `test`; insert into t1 values( 73 )
master-bin.000001 30096 Query 1 30186 use `test`; insert into t1 values( 72 )
master-bin.000001 30186 Query 1 30276 use `test`; insert into t1 values( 71 )
master-bin.000001 30276 Query 1 30366 use `test`; insert into t1 values( 70 )
master-bin.000001 30366 Query 1 30456 use `test`; insert into t1 values( 69 )
master-bin.000001 30456 Query 1 30546 use `test`; insert into t1 values( 68 )
master-bin.000001 30546 Query 1 30636 use `test`; insert into t1 values( 67 )
master-bin.000001 30636 Query 1 30726 use `test`; insert into t1 values( 66 )
master-bin.000001 30726 Query 1 30816 use `test`; insert into t1 values( 65 )
master-bin.000001 30816 Query 1 30906 use `test`; insert into t1 values( 64 )
master-bin.000001 30906 Query 1 30996 use `test`; insert into t1 values( 63 )
master-bin.000001 30996 Query 1 31086 use `test`; insert into t1 values( 62 )
master-bin.000001 31086 Query 1 31176 use `test`; insert into t1 values( 61 )
master-bin.000001 31176 Query 1 31266 use `test`; insert into t1 values( 60 )
master-bin.000001 31266 Query 1 31356 use `test`; insert into t1 values( 59 )
master-bin.000001 31356 Query 1 31446 use `test`; insert into t1 values( 58 )
master-bin.000001 31446 Query 1 31536 use `test`; insert into t1 values( 57 )
master-bin.000001 31536 Query 1 31626 use `test`; insert into t1 values( 56 )
master-bin.000001 31626 Query 1 31716 use `test`; insert into t1 values( 55 )
master-bin.000001 31716 Query 1 31806 use `test`; insert into t1 values( 54 )
master-bin.000001 31806 Query 1 31896 use `test`; insert into t1 values( 53 )
master-bin.000001 31896 Query 1 31986 use `test`; insert into t1 values( 52 )
master-bin.000001 31986 Query 1 32076 use `test`; insert into t1 values( 51 )
master-bin.000001 32076 Query 1 32166 use `test`; insert into t1 values( 50 )
master-bin.000001 32166 Query 1 32256 use `test`; insert into t1 values( 49 )
master-bin.000001 32256 Query 1 32346 use `test`; insert into t1 values( 48 )
master-bin.000001 32346 Query 1 32436 use `test`; insert into t1 values( 47 )
master-bin.000001 32436 Query 1 32526 use `test`; insert into t1 values( 46 )
master-bin.000001 32526 Query 1 32616 use `test`; insert into t1 values( 45 )
master-bin.000001 32616 Query 1 32706 use `test`; insert into t1 values( 44 )
master-bin.000001 32706 Query 1 32796 use `test`; insert into t1 values( 43 )
master-bin.000001 32796 Query 1 32886 use `test`; insert into t1 values( 42 )
master-bin.000001 32886 Query 1 32976 use `test`; insert into t1 values( 41 )
master-bin.000001 32976 Query 1 33066 use `test`; insert into t1 values( 40 )
master-bin.000001 33066 Query 1 33156 use `test`; insert into t1 values( 39 )
master-bin.000001 33156 Query 1 33246 use `test`; insert into t1 values( 38 )
master-bin.000001 33246 Query 1 33336 use `test`; insert into t1 values( 37 )
master-bin.000001 33336 Query 1 33426 use `test`; insert into t1 values( 36 )
master-bin.000001 33426 Query 1 33516 use `test`; insert into t1 values( 35 )
master-bin.000001 33516 Query 1 33606 use `test`; insert into t1 values( 34 )
master-bin.000001 33606 Query 1 33696 use `test`; insert into t1 values( 33 )
master-bin.000001 33696 Query 1 33786 use `test`; insert into t1 values( 32 )
master-bin.000001 33786 Query 1 33876 use `test`; insert into t1 values( 31 )
master-bin.000001 33876 Query 1 33966 use `test`; insert into t1 values( 30 )
master-bin.000001 33966 Query 1 34056 use `test`; insert into t1 values( 29 )
master-bin.000001 34056 Query 1 34146 use `test`; insert into t1 values( 28 )
master-bin.000001 34146 Query 1 34236 use `test`; insert into t1 values( 27 )
master-bin.000001 34236 Query 1 34326 use `test`; insert into t1 values( 26 )
master-bin.000001 34326 Query 1 34416 use `test`; insert into t1 values( 25 )
master-bin.000001 34416 Query 1 34506 use `test`; insert into t1 values( 24 )
master-bin.000001 34506 Query 1 34596 use `test`; insert into t1 values( 23 )
master-bin.000001 34596 Query 1 34686 use `test`; insert into t1 values( 22 )
master-bin.000001 34686 Query 1 34776 use `test`; insert into t1 values( 21 )
master-bin.000001 34776 Query 1 34866 use `test`; insert into t1 values( 20 )
master-bin.000001 34866 Query 1 34956 use `test`; insert into t1 values( 19 )
master-bin.000001 34956 Query 1 35046 use `test`; insert into t1 values( 18 )
master-bin.000001 35046 Query 1 35136 use `test`; insert into t1 values( 17 )
master-bin.000001 35136 Query 1 35226 use `test`; insert into t1 values( 16 )
master-bin.000001 35226 Query 1 35316 use `test`; insert into t1 values( 15 )
master-bin.000001 35316 Query 1 35406 use `test`; insert into t1 values( 14 )
master-bin.000001 35406 Query 1 35496 use `test`; insert into t1 values( 13 )
master-bin.000001 35496 Query 1 35586 use `test`; insert into t1 values( 12 )
master-bin.000001 35586 Query 1 35676 use `test`; insert into t1 values( 11 )
master-bin.000001 35676 Query 1 35766 use `test`; insert into t1 values( 10 )
master-bin.000001 35766 Query 1 35855 use `test`; insert into t1 values( 9 )
master-bin.000001 35855 Query 1 35944 use `test`; insert into t1 values( 8 )
master-bin.000001 35944 Query 1 36033 use `test`; insert into t1 values( 7 )
master-bin.000001 36033 Query 1 36122 use `test`; insert into t1 values( 6 )
master-bin.000001 36122 Query 1 36211 use `test`; insert into t1 values( 5 )
master-bin.000001 36211 Query 1 36300 use `test`; insert into t1 values( 4 )
master-bin.000001 36300 Query 1 36389 use `test`; insert into t1 values( 3 )
master-bin.000001 36389 Query 1 36478 use `test`; insert into t1 values( 2 )
master-bin.000001 36478 Query 1 36567 use `test`; insert into t1 values( 1 )
master-bin.000001 36567 Xid 1 36594 COMMIT /* XID */
master-bin.000001 36594 Rotate 1 36638 master-bin.000002;pos=4
drop table t1;
set global binlog_cache_size=@bcs;
set session autocommit = @ac;
@ -590,10 +590,10 @@ deallocate prepare stmt;
drop table t1;
show binlog events from 0;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 106 Server version, Binlog ver: 4
master-bin.000001 106 Query 1 227 use `test`; create table t1 (a bigint unsigned, b bigint(20) unsigned)
master-bin.000001 227 Query 1 351 use `test`; insert into t1 values (9999999999999999,14632475938453979136)
master-bin.000001 351 Query 1 427 use `test`; drop table t1
master-bin.000001 4 Format_desc 1 107 Server version, Binlog ver: 4
master-bin.000001 107 Query 1 228 use `test`; create table t1 (a bigint unsigned, b bigint(20) unsigned)
master-bin.000001 228 Query 1 352 use `test`; insert into t1 values (9999999999999999,14632475938453979136)
master-bin.000001 352 Query 1 428 use `test`; drop table t1
reset master;
CREATE DATABASE bug39182 DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
USE bug39182;

4
mysql-test/suite/binlog/t/binlog_incident.test
View File

@ -19,9 +19,9 @@ REPLACE INTO t1 VALUES (4);
DROP TABLE t1;
FLUSH LOGS;
exec $MYSQL_BINLOG --start-position=106 $MYSQLD_DATADIR/master-bin.000001 >$MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql;
exec $MYSQL_BINLOG --start-position=107 $MYSQLD_DATADIR/master-bin.000001 >$MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql;
--disable_query_log
eval SELECT cont LIKE '%RELOAD DATABASE; # Shall generate syntax error%' AS `Contain RELOAD DATABASE` FROM (SELECT load_file('$MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql') AS cont) AS tbl;
--enable_query_log
remove_file $MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql;
remove_file $MYSQLTEST_VARDIR/tmp/binlog_incident-bug44442.sql;

6
mysql-test/suite/rpl/r/rpl_000015.result
View File

@ -44,6 +44,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
change master to master_host='127.0.0.1',master_user='root',
master_password='',master_port=MASTER_PORT;
SHOW SLAVE STATUS;
@ -85,6 +87,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
start slave;
SHOW SLAVE STATUS;
Slave_IO_State #
@ -125,6 +129,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
drop table if exists t1;
create table t1 (n int, PRIMARY KEY(n));
insert into t1 values (10),(45),(90);

2
mysql-test/suite/rpl/r/rpl_bug33931.result
View File

@ -43,4 +43,6 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno #
Last_SQL_Error Failed during slave thread initialization
Replicate_Ignore_Server_Ids
Master_Server_Id 0
SET GLOBAL debug="";

4
mysql-test/suite/rpl/r/rpl_change_master.result
View File

@ -50,6 +50,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
change master to master_user='root';
SHOW SLAVE STATUS;
Slave_IO_State #
@ -90,6 +92,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
start slave;
select * from t1;
n

6
mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
View File

@ -89,6 +89,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
*** Test lock wait timeout ***
include/stop_slave.inc
@ -151,6 +153,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
*** Test lock wait timeout and purged relay logs ***
SET @my_max_relay_log_size= @@global.max_relay_log_size;
@ -218,6 +222,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
*** Clean up ***
DROP TABLE t1,t2,t3;

20
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
View File

@ -93,6 +93,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
SELECT * FROM t2 ORDER BY a;
@ -160,6 +162,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t3 ***
@ -222,6 +226,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t4 ***
@ -284,6 +290,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t5 ***
@ -345,6 +353,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
*** Drop t6 ***
DROP TABLE t6;
@ -454,6 +464,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1364
Last_SQL_Error Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 331
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Create t10 on slave ***
@ -513,6 +525,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t10 ***
@ -574,6 +588,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t11 ***
@ -824,6 +840,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1060
Last_SQL_Error Error 'Duplicate column name 'c6'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c6 INT AFTER c5'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
*** Try to insert in master ****
@ -964,6 +982,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
** DROP table t17 ***

20
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
View File

@ -93,6 +93,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
SELECT * FROM t2 ORDER BY a;
@ -160,6 +162,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t3 ***
@ -222,6 +226,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t4 ***
@ -284,6 +290,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t5 ***
@ -345,6 +353,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
*** Drop t6 ***
DROP TABLE t6;
@ -454,6 +464,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1364
Last_SQL_Error Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 331
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Create t10 on slave ***
@ -513,6 +525,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t10 ***
@ -574,6 +588,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t11 ***
@ -824,6 +840,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1060
Last_SQL_Error Error 'Duplicate column name 'c6'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c6 INT AFTER c5'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
*** Try to insert in master ****
@ -964,6 +982,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
** DROP table t17 ***

42
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
View File

@ -133,6 +133,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
***** Testing Altering table def scenario *****
@ -509,6 +511,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
****************************************
* columns in master at middle of table *
@ -583,6 +587,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -658,6 +664,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -809,6 +817,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1091
Last_SQL_Error Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -895,6 +905,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1054
Last_SQL_Error Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -981,6 +993,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1072
Last_SQL_Error Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -1274,6 +1288,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
***** Testing Altering table def scenario *****
@ -1650,6 +1666,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
****************************************
* columns in master at middle of table *
@ -1724,6 +1742,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -1799,6 +1819,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -1950,6 +1972,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1091
Last_SQL_Error Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -2036,6 +2060,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1054
Last_SQL_Error Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -2122,6 +2148,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1072
Last_SQL_Error Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -2415,6 +2443,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
***** Testing Altering table def scenario *****
@ -2791,6 +2821,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
****************************************
* columns in master at middle of table *
@ -2865,6 +2897,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -2940,6 +2974,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -3091,6 +3127,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1091
Last_SQL_Error Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -3177,6 +3215,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1054
Last_SQL_Error Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -3263,6 +3303,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1072
Last_SQL_Error Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;

42
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
View File

@ -133,6 +133,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
***** Testing Altering table def scenario *****
@ -509,6 +511,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
****************************************
* columns in master at middle of table *
@ -583,6 +587,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -658,6 +664,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -809,6 +817,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1091
Last_SQL_Error Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -895,6 +905,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1054
Last_SQL_Error Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -981,6 +993,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1072
Last_SQL_Error Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -1274,6 +1288,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
***** Testing Altering table def scenario *****
@ -1650,6 +1666,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
****************************************
* columns in master at middle of table *
@ -1724,6 +1742,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -1799,6 +1819,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -1950,6 +1972,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1091
Last_SQL_Error Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -2036,6 +2060,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1054
Last_SQL_Error Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -2122,6 +2148,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1072
Last_SQL_Error Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -2415,6 +2443,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
***** Testing Altering table def scenario *****
@ -2791,6 +2821,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
****************************************
* columns in master at middle of table *
@ -2865,6 +2897,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 5, test.t10 has type 254
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -2940,6 +2974,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 252, test.t11 has type 15
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -3091,6 +3127,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1091
Last_SQL_Error Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -3177,6 +3215,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1054
Last_SQL_Error Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
@ -3263,6 +3303,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1072
Last_SQL_Error Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;

2
mysql-test/suite/rpl/r/rpl_flushlog_loop.result
View File

@ -59,3 +59,5 @@ Last_IO_Errno #
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 2

2
mysql-test/suite/rpl/r/rpl_grant.result
View File

@ -80,3 +80,5 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1

4
mysql-test/suite/rpl/r/rpl_heartbeat.result
View File

@ -92,6 +92,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SHOW SLAVE STATUS;
Slave_IO_State #
Master_Host 127.0.0.1
@ -131,6 +133,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
show status like 'Slave_heartbeat_period';;
Variable_name Slave_heartbeat_period
Value 0.500

4
mysql-test/suite/rpl/r/rpl_incident.result
View File

@ -64,6 +64,8 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1590
Last_SQL_Error The incident LOST_EVENTS occured on the master. Message: <none>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
SELECT * FROM t1;
@ -111,4 +113,6 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
DROP TABLE t1;

4
mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
View File

@ -50,6 +50,8 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 1105
Last_SQL_Error Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT * FROM t1;
a b
stop slave;
@ -141,6 +143,8 @@ SELECT t2.field_a, t2.field_b, t2.field_c
FROM t2
ON DUPLICATE KEY UPDATE
t1.field_3 = t2.field_c'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT * FROM t1;
id field_1 field_2 field_3
drop table t1, t2;

6
mysql-test/suite/rpl/r/rpl_loaddata.result
View File

@ -73,6 +73,8 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
set sql_log_bin=0;
delete from t1;
set sql_log_bin=1;
@ -119,6 +121,8 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
set global sql_slave_skip_counter=1;
start slave;
set sql_log_bin=0;
@ -166,6 +170,8 @@ Last_IO_Errno 0
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
reset master;
create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60),
unique(day)) engine=MyISAM;

4
mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
View File

@ -45,6 +45,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE t1;
SHOW SLAVE STATUS;
Slave_IO_State #
@ -85,6 +87,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1593
Last_SQL_Error Fatal error: Not enough memory
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
DROP TABLE t1;

4
mysql-test/suite/rpl/r/rpl_log_pos.result
View File

@ -48,6 +48,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
start slave;
include/stop_slave.inc
SHOW SLAVE STATUS;
@ -89,6 +91,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>

2
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
View File

@ -63,6 +63,8 @@ Last_IO_Errno #
Last_IO_Error
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4

2
mysql-test/suite/rpl/r/rpl_replicate_do.result
View File

@ -65,6 +65,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
create table t1 (ts timestamp);
set one_shot time_zone='met';
insert into t1 values('2005-08-12 00:00:00');

6
mysql-test/suite/rpl/r/rpl_rotate_logs.result
View File

@ -53,6 +53,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
select * from t1;
s
Could not break slave
@ -132,6 +134,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
select * from t2;
m
34
@ -196,6 +200,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
lock tables t3 read;
select count(*) from t3 where n >= 4;
count(*)

26
mysql-test/suite/rpl/r/rpl_row_colSize.result
View File

@ -57,6 +57,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 10, test.t1 on slave has size 3. Master's column size should be <= the slave's column size.
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -111,6 +113,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 12, test.t1 on slave has size 12. Master's column size should be <= the slave's column size.
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -165,6 +169,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 10, test.t1 on slave has size 3. Master's column size should be <= the slave's column size.
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -220,6 +226,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 5, test.t1 has type 4
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -275,6 +283,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 8, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -329,6 +339,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 2. Master's column size should be <= the slave's column size.
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -384,6 +396,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -439,6 +453,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 20, test.t1 on slave has size 11. Master's column size should be <= the slave's column size.
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -525,6 +541,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 2, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -580,6 +598,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 2000, test.t1 on slave has size 100. Master's column size should be <= the slave's column size.
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -634,6 +654,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 200, test.t1 on slave has size 10. Master's column size should be <= the slave's column size.
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -688,6 +710,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 2000, test.t1 on slave has size 1000. Master's column size should be <= the slave's column size.
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -743,6 +767,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 size mismatch - master has size 4, test.t1 on slave has size 1. Master's column size should be <= the slave's column size.
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT COUNT(*) FROM t1;
COUNT(*)
0

2
mysql-test/suite/rpl/r/rpl_row_log.result
View File

@ -283,6 +283,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1;

2
mysql-test/suite/rpl/r/rpl_row_log_innodb.result
View File

@ -283,6 +283,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1;

12
mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
View File

@ -60,6 +60,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
#
# Test 2
#
@ -108,6 +110,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
#
# Test 3: max_relay_log_size = 0
#
@ -156,6 +160,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
#
# Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions
#
@ -201,6 +207,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
#
# Test 5
#
@ -247,6 +255,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
#
# Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
#
@ -291,6 +301,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
flush logs;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB

8
mysql-test/suite/rpl/r/rpl_row_reset_slave.result
View File

@ -43,6 +43,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
stop slave;
change master to master_user='test';
SHOW SLAVE STATUS;
@ -84,6 +86,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
reset slave;
SHOW SLAVE STATUS;
Slave_IO_State #
@ -124,6 +128,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
start slave;
SHOW SLAVE STATUS;
Slave_IO_State #
@ -164,6 +170,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
stop slave;
reset slave;
start slave;

12
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
View File

@ -144,6 +144,8 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1364
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (2);
@ -195,6 +197,8 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
INSERT INTO t9 VALUES (4);
INSERT INTO t4 VALUES (4);
SHOW SLAVE STATUS;
@ -236,6 +240,8 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (5);
@ -279,6 +285,8 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@ -322,6 +330,8 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@ -364,6 +374,8 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
INSERT INTO t7 VALUES (1),(2),(3);
INSERT INTO t8 VALUES (1),(2),(3);
SELECT * FROM t7 ORDER BY a;

12
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
View File

@ -144,6 +144,8 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1364
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (2);
@ -195,6 +197,8 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
INSERT INTO t9 VALUES (4);
INSERT INTO t4 VALUES (4);
SHOW SLAVE STATUS;
@ -236,6 +240,8 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (5);
@ -279,6 +285,8 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@ -322,6 +330,8 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@ -364,6 +374,8 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
INSERT INTO t7 VALUES (1),(2),(3);
INSERT INTO t8 VALUES (1),(2),(3);
SELECT * FROM t7 ORDER BY a;

8
mysql-test/suite/rpl/r/rpl_row_until.result
View File

@ -59,6 +59,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
START SLAVE UNTIL MASTER_LOG_FILE='master-no-such-bin.000001', MASTER_LOG_POS=291;
SELECT * FROM t1;
n
@ -105,6 +107,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000002', RELAY_LOG_POS=relay_pos_insert1_t2
SELECT * FROM t2;
n
@ -149,6 +153,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
START SLAVE;
include/stop_slave.inc
START SLAVE SQL_THREAD UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=master_pos_create_t2
@ -191,6 +197,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
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;

4
mysql-test/suite/rpl/r/rpl_skip_error.result
View File

@ -70,6 +70,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
==== Clean Up ====
drop table t1;
create table t1(a int primary key);
@ -123,6 +125,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
==== Clean Up ====
drop table t1;
==== Using Innodb ====

2
mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
View File

@ -49,6 +49,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 9
Last_SQL_Error Error in Begin_load_query event: write to '../../tmp/SQL_LOAD.data' failed
Replicate_Ignore_Server_Ids
Master_Server_Id 1
drop table t1;
drop table t1;
call mtr.add_suppression("Slave: Error writing file 'UNKNOWN' .Errcode: 9. Error_code: 3");

4
mysql-test/suite/rpl/r/rpl_slave_skip.result
View File

@ -82,6 +82,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
SELECT * FROM t1;
@ -146,6 +148,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
**** On Master ****
DROP TABLE t1, t2;
SET SESSION BINLOG_FORMAT=ROW;

4
mysql-test/suite/rpl/r/rpl_ssl.result
View File

@ -58,6 +58,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
select * from t1;
t
@ -102,6 +104,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
drop user replssl@localhost;
drop table t1;
End of 5.0 tests

6
mysql-test/suite/rpl/r/rpl_ssl1.result
View File

@ -57,6 +57,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
stop slave;
change master to master_user='root',master_password='', master_ssl=0;
start slave;
@ -101,6 +103,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
stop slave;
change master to
master_host="localhost",
@ -155,4 +159,6 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
drop table t1;

2
mysql-test/suite/rpl/r/rpl_stm_log.result
View File

@ -265,6 +265,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1;

12
mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
View File

@ -60,6 +60,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
#
# Test 2
#
@ -108,6 +110,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
#
# Test 3: max_relay_log_size = 0
#
@ -156,6 +160,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
#
# Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions
#
@ -201,6 +207,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
#
# Test 5
#
@ -247,6 +255,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
#
# Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
#
@ -291,6 +301,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
flush logs;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB

8
mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
View File

@ -43,6 +43,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
stop slave;
change master to master_user='test';
SHOW SLAVE STATUS;
@ -84,6 +86,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
reset slave;
SHOW SLAVE STATUS;
Slave_IO_State #
@ -124,6 +128,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
start slave;
SHOW SLAVE STATUS;
Slave_IO_State #
@ -164,6 +170,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
stop slave;
reset slave;
start slave;

8
mysql-test/suite/rpl/r/rpl_stm_until.result
View File

@ -63,6 +63,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
select * from t1;
n
@ -109,6 +111,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746;
select * from t2;
n
@ -153,6 +157,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
start slave;
[on master]
[on slave]
@ -197,6 +203,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
==== Test various error conditions ====
start slave until master_log_file='master-bin', master_log_pos=561;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL

2
mysql-test/suite/rpl/r/rpl_temporary_errors.result
View File

@ -79,6 +79,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
DROP TABLE t1;
**** On Master ****
DROP TABLE t1;

2
mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
View File

@ -179,6 +179,8 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno <Last_SQL_Errno>
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
set GLOBAL slave_transaction_retries=10;
include/start_slave.inc
select * from t1 order by nid;

4
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
View File

@ -56,6 +56,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT * FROM t1 ORDER BY a;
a b
1 2
@ -99,5 +101,7 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 2
STOP SLAVE;
DROP TABLE t1;

4
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
View File

@ -53,6 +53,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 2
SELECT * FROM t1 ORDER BY a;
a b
1 2
@ -102,3 +104,5 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1

20
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
View File

@ -93,6 +93,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 size mismatch - master has size 10, test.t2 on slave has size 6. Master's column size should be <= the slave's column size.
Replicate_Ignore_Server_Ids
Master_Server_Id 1
STOP SLAVE;
RESET SLAVE;
SELECT * FROM t2 ORDER BY a;
@ -160,6 +162,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t3 ***
@ -222,6 +226,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t4 ***
@ -284,6 +290,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t5 ***
@ -345,6 +353,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
*** Drop t6 ***
DROP TABLE t6;
@ -454,6 +464,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1364
Last_SQL_Error Could not execute Write_rows event on table test.t9; Field 'e' doesn't have a default value, Error_code: 1364; handler error HA_ERR_ROWS_EVENT_APPLY; the event's master log master-bin.000001, end_log_pos 447
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Create t10 on slave ***
@ -513,6 +525,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t10 ***
@ -574,6 +588,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
*** Drop t11 ***
@ -824,6 +840,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1060
Last_SQL_Error Error 'Duplicate column name 'c6'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c6 INT AFTER c5'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
*** Try to insert in master ****
@ -964,6 +982,8 @@ Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1535
Last_SQL_Error Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
** DROP table t17 ***

12
mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result
View File

@ -33,15 +33,15 @@ c1 c2 c3
row3 C 3
row4 D 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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error
<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 Yes Yes <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> No <Last_IO_Errno> <Last_IO_Error> 0
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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id
<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 Yes Yes <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> No <Last_IO_Errno> <Last_IO_Error> 0 1
STOP SLAVE;
CHANGE MASTER TO
master_log_file = 'master-bin.000001',
master_log_pos = <the_pos> ;
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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error
<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 No No <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> No <Last_IO_Errno> <Last_IO_Error> 0
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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id
<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 No No <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> No <Last_IO_Errno> <Last_IO_Error> 0 1
START SLAVE;
SELECT * FROM t1 ORDER BY c3;
c1 c2 c3
@ -68,6 +68,6 @@ SELECT * FROM t1;
c1 c2 c3
row2 new on slave 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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error
<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 Yes Yes <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> <Last_IO_Errno> <Last_IO_Error> 0
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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id
<Slave_IO_State> 127.0.0.1 root MASTER_PORT 1 master-bin.000001 <Read_Master_Log_Pos> <Relay_Log_File> <Relay_Log_Pos> master-bin.000001 Yes Yes <Replicate_Ignore_Table> 0 0 <Exec_Master_Log_Pos> <Relay_Log_Space> None 0 No <Seconds_Behind_Master> <Last_IO_Errno> <Last_IO_Error> 0 1
DROP TABLE IF EXISTS t1;

2
mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result
View File

@ -107,6 +107,8 @@ Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
SELECT hex(c1),hex(c2),c3 FROM t1 ORDER BY c3;
hex(c1) hex(c2) c3
1 1 row1

2
mysql-test/t/ctype_cp932_binlog_stm.test
View File

@ -33,7 +33,7 @@ delimiter ;|
# the log's contents) that caused the server crash.
--error 1220
SHOW BINLOG EVENTS FROM 365;
SHOW BINLOG EVENTS FROM 366;
--echo Bug#44352 UPPER/LOWER function doesn't work correctly on cp932 and sjis environment.
CREATE TABLE t1 (a varchar(16)) character set cp932;

2
mysql-test/t/mysqlbinlog.test
View File

@ -119,7 +119,7 @@ select "--- reading stdin --" as "";
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
--exec $MYSQL_BINLOG --short-form --position=80 - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001
--exec $MYSQL_BINLOG --short-form --position=79 - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001
drop table t1,t2;
#

1
sql/lex.h
View File

@ -244,6 +244,7 @@ static SYMBOL symbols[] = {
{ "IDENTIFIED", SYM(IDENTIFIED_SYM)},
{ "IF", SYM(IF)},
{ "IGNORE", SYM(IGNORE_SYM)},
{ "IGNORE_SERVER_IDS", SYM(IGNORE_SERVER_IDS_SYM)},
{ "IMPORT", SYM(IMPORT)},
{ "IN", SYM(IN_SYM)},
{ "INDEX", SYM(INDEX_SYM)},

88
sql/rpl_mi.cc
View File

@ -27,17 +27,19 @@ int init_intvar_from_file(int* var, IO_CACHE* f, int default_val);
int init_strvar_from_file(char *var, int max_size, IO_CACHE *f,
const char *default_val);
int init_floatvar_from_file(float* var, IO_CACHE* f, float default_val);
int init_dynarray_intvar_from_file(DYNAMIC_ARRAY* arr, IO_CACHE* f);
Master_info::Master_info()
:Slave_reporting_capability("I/O"),
ssl(0), ssl_verify_server_cert(0), fd(-1), io_thd(0), inited(0),
abort_slave(0),slave_running(0), slave_run_id(0),
heartbeat_period(0), received_heartbeats(0)
heartbeat_period(0), received_heartbeats(0), master_id(0)
{
host[0] = 0; user[0] = 0; password[0] = 0;
ssl_ca[0]= 0; ssl_capath[0]= 0; ssl_cert[0]= 0;
ssl_cipher[0]= 0; ssl_key[0]= 0;
my_init_dynamic_array(&ignore_server_ids, sizeof(::server_id), 16, 16);
bzero((char*) &file, sizeof(file));
pthread_mutex_init(&run_lock, MY_MUTEX_INIT_FAST);
pthread_mutex_init(&data_lock, MY_MUTEX_INIT_FAST);
@ -48,6 +50,7 @@ Master_info::Master_info()
Master_info::~Master_info()
{
delete_dynamic(&ignore_server_ids);
pthread_mutex_destroy(&run_lock);
pthread_mutex_destroy(&data_lock);
pthread_cond_destroy(&data_cond);
@ -55,6 +58,43 @@ Master_info::~Master_info()
pthread_cond_destroy(&stop_cond);
}
/**
A comparison function to be supplied as argument to @c sort_dynamic()
and @c bsearch()
@return -1 if first argument is less, 0 if it equal to, 1 if it is greater
than the second
*/
int change_master_server_id_cmp(ulong *id1, ulong *id2)
{
return *id1 < *id2? -1 : (*id1 > *id2? 1 : 0);
}
/**
Reports if the s_id server has been configured to ignore events
it generates with
CHANGE MASTER IGNORE_SERVER_IDS= ( list of server ids )
Method is called from the io thread event receiver filtering.
@param s_id the master server identifier
@retval TRUE if s_id is in the list of ignored master servers,
@retval FALSE otherwise.
*/
bool Master_info::shall_ignore_server_id(ulong s_id)
{
if (likely(ignore_server_ids.elements == 1))
return (* (ulong*) dynamic_array_ptr(&ignore_server_ids, 0)) == s_id;
else
return bsearch((const ulong *) &s_id,
ignore_server_ids.buffer,
ignore_server_ids.elements, sizeof(ulong),
(int (*) (const void*, const void*)) change_master_server_id_cmp)
!= NULL;
}
void init_master_info_with_options(Master_info* mi)
{
@ -105,12 +145,12 @@ enum {
/* 5.1.16 added value of master_ssl_verify_server_cert */
LINE_FOR_MASTER_SSL_VERIFY_SERVER_CERT= 15,
/* 6.0 added value of master_heartbeat_period */
LINE_FOR_MASTER_HEARTBEAT_PERIOD= 16,
/* 6.0 added value of master_ignore_server_id */
LINE_FOR_REPLICATE_IGNORE_SERVER_IDS= 17,
/* Number of lines currently used when saving master info file */
LINES_IN_MASTER_INFO= LINE_FOR_MASTER_HEARTBEAT_PERIOD
LINES_IN_MASTER_INFO= LINE_FOR_REPLICATE_IGNORE_SERVER_IDS
};
int init_master_info(Master_info* mi, const char* master_info_fname,
@ -304,6 +344,16 @@ file '%s')", fname);
if (lines >= LINE_FOR_MASTER_HEARTBEAT_PERIOD &&
init_floatvar_from_file(&master_heartbeat_period, &mi->file, 0.0))
goto errwithmsg;
/*
Starting from 6.0 list of server_id of ignorable servers might be
in the file
*/
if (lines >= LINE_FOR_REPLICATE_IGNORE_SERVER_IDS &&
init_dynarray_intvar_from_file(&mi->ignore_server_ids, &mi->file))
{
sql_print_error("Failed to initialize master info ignore_server_ids");
goto errwithmsg;
}
}
#ifndef HAVE_OPENSSL
@ -384,7 +434,29 @@ int flush_master_info(Master_info* mi, bool flush_relay_log_cache)
if (flush_relay_log_cache &&
flush_io_cache(mi->rli.relay_log.get_log_file()))
DBUG_RETURN(2);
/*
produce a line listing the total number and all the ignored server_id:s
*/
char* ignore_server_ids_buf;
{
ignore_server_ids_buf=
(char *) my_malloc((sizeof(::server_id) * 3 + 1) *
(1 + mi->ignore_server_ids.elements), MYF(MY_WME));
if (!ignore_server_ids_buf)
DBUG_RETURN(1);
for (ulong i= 0, cur_len= my_sprintf(ignore_server_ids_buf,
(ignore_server_ids_buf, "%u",
mi->ignore_server_ids.elements));
i < mi->ignore_server_ids.elements; i++)
{
ulong s_id;
get_dynamic(&mi->ignore_server_ids, (uchar*) &s_id, i);
cur_len +=my_sprintf(ignore_server_ids_buf + cur_len,
(ignore_server_ids_buf + cur_len,
" %lu", s_id));
}
}
/*
We flushed the relay log BEFORE the master.info file, because if we crash
now, we will get a duplicate event in the relay log at restart. If we
@ -405,14 +477,16 @@ int flush_master_info(Master_info* mi, bool flush_relay_log_cache)
my_sprintf(heartbeat_buf, (heartbeat_buf, "%.3f", mi->heartbeat_period));
my_b_seek(file, 0L);
my_b_printf(file,
"%u\n%s\n%s\n%s\n%s\n%s\n%d\n%d\n%d\n%s\n%s\n%s\n%s\n%s\n%d\n%s\n",
"%u\n%s\n%s\n%s\n%s\n%s\n%d\n%d\n%d\n%s\n%s\n%s\n%s\n%s\n%d\n%s\n%s\n",
LINES_IN_MASTER_INFO,
mi->master_log_name, llstr(mi->master_log_pos, lbuf),
mi->host, mi->user,
mi->password, mi->port, mi->connect_retry,
(int)(mi->ssl), mi->ssl_ca, mi->ssl_capath, mi->ssl_cert,
mi->ssl_cipher, mi->ssl_key, mi->ssl_verify_server_cert,
heartbeat_buf);
heartbeat_buf, ignore_server_ids_buf);
my_free(ignore_server_ids_buf, MYF(0));
DBUG_RETURN(-flush_io_cache(file));
}

9
sql/rpl_mi.h
View File

@ -20,6 +20,7 @@
#include "rpl_rli.h"
#include "rpl_reporting.h"
#include "my_sys.h"
/*****************************************************************************
@ -60,6 +61,7 @@ class Master_info : public Slave_reporting_capability
public:
Master_info();
~Master_info();
bool shall_ignore_server_id(ulong s_id);
/* the variables below are needed because we can change masters on the fly */
char master_log_name[FN_REFLEN];
@ -83,8 +85,6 @@ class Master_info : public Slave_reporting_capability
Relay_log_info rli;
uint port;
uint connect_retry;
float heartbeat_period; // interface with CHANGE MASTER or master.info
ulonglong received_heartbeats; // counter of received heartbeat events
#ifndef DBUG_OFF
int events_till_disconnect;
#endif
@ -102,6 +102,10 @@ class Master_info : public Slave_reporting_capability
*/
long clock_diff_with_master;
float heartbeat_period; // interface with CHANGE MASTER or master.info
ulonglong received_heartbeats; // counter of received heartbeat events
DYNAMIC_ARRAY ignore_server_ids;
ulong master_id;
};
void init_master_info_with_options(Master_info* mi);
@ -111,6 +115,7 @@ int init_master_info(Master_info* mi, const char* master_info_fname,
int thread_mask);
void end_master_info(Master_info* mi);
int flush_master_info(Master_info* mi, bool flush_relay_log_cache);
int change_master_server_id_cmp(ulong *id1, ulong *id2);
#endif /* HAVE_REPLICATION */
#endif /* RPL_MI_H */

3
sql/share/errmsg.txt
View File

@ -6163,6 +6163,9 @@ ER_SLAVE_HEARTBEAT_FAILURE
ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE
eng "The requested value for the heartbeat period %s %s"
ER_SLAVE_IGNORE_SERVER_IDS
eng "The requested server id %d clashes with the slave startup option --replicate-same-server-id"
ER_NDB_REPLICATION_SCHEMA_ERROR
eng "Bad schema for mysql.ndb_replication table. Message: %-.64s"
ER_CONFLICT_FN_PARSE_ERROR

160
sql/slave.cc
View File

@ -880,6 +880,95 @@ int init_floatvar_from_file(float* var, IO_CACHE* f, float default_val)
DBUG_RETURN(1);
}
/**
A master info read method
This function is called from @c init_master_info() along with
relatives to restore some of @c active_mi members.
Particularly, this function is responsible for restoring
IGNORE_SERVER_IDS list of servers whose events the slave is
going to ignore (to not log them in the relay log).
Items being read are supposed to be decimal output of values of a
type shorter or equal of @c long and separated by the single space.
@param arr @c DYNAMIC_ARRAY pointer to storage for servers id
@param f @c IO_CACHE pointer to the source file
@retval 0 All OK
@retval non-zero An error
*/
int init_dynarray_intvar_from_file(DYNAMIC_ARRAY* arr, IO_CACHE* f)
{
int ret= 0;
char buf[16 * (sizeof(long)*4 + 1)]; // static buffer to use most of times
char *buf_act= buf; // actual buffer can be dynamic if static is short
char *token, *last;
uint num_items; // number of items of `arr'
size_t read_size;
DBUG_ENTER("init_dynarray_intvar_from_file");
if ((read_size= my_b_gets(f, buf_act, sizeof(buf))) == 0)
{
return 0; // no line in master.info
}
if (read_size + 1 == sizeof(buf) && buf[sizeof(buf) - 2] != '\n')
{
/*
short read happend; allocate sufficient memory and make the 2nd read
*/
char buf_work[(sizeof(long)*3 + 1)*16];
memcpy(buf_work, buf, sizeof(buf_work));
num_items= atoi(strtok_r(buf_work, " ", &last));
size_t snd_size;
/*
max size lower bound approximate estimation bases on the formula:
(the items number + items themselves) *
(decimal size + space) - 1 + `\n' + '\0'
*/
size_t max_size= (1 + num_items) * (sizeof(long)*3 + 1) + 1;
buf_act= (char*) my_malloc(max_size, MYF(MY_WME));
memcpy(buf_act, buf, read_size);
snd_size= my_b_gets(f, buf_act + read_size, max_size - read_size);
if (snd_size == 0 ||
(snd_size + 1 == max_size - read_size) && buf[max_size - 2] != '\n')
{
/*
failure to make the 2nd read or short read again
*/
ret= 1;
goto err;
}
}
token= strtok_r(buf_act, " ", &last);
if (token == NULL)
{
ret= 1;
goto err;
}
num_items= atoi(token);
for (uint i=0; i < num_items; i++)
{
token= strtok_r(NULL, " ", &last);
if (token == NULL)
{
ret= 1;
goto err;
}
else
{
ulong val= atol(token);
insert_dynamic(arr, (uchar *) &val);
}
}
err:
if (buf_act != buf)
my_free(buf_act, MYF(0));
DBUG_RETURN(ret);
}
static bool check_io_slave_killed(THD *thd, Master_info *mi, const char *info)
{
if (io_slave_killed(thd, mi))
@ -1058,7 +1147,7 @@ static int get_master_version_and_clock(MYSQL* mysql, Master_info* mi)
(master_res= mysql_store_result(mysql)) &&
(master_row= mysql_fetch_row(master_res)))
{
if ((::server_id == strtoul(master_row[1], 0, 10)) &&
if ((::server_id == (mi->master_id= strtoul(master_row[1], 0, 10))) &&
!mi->rli.replicate_same_server_id)
{
errmsg= "The slave I/O thread stops because master and slave have equal \
@ -1096,6 +1185,13 @@ maybe it is a *VERY OLD MASTER*.");
mysql_free_result(master_res);
master_res= NULL;
}
if (mi->master_id == 0 && mi->ignore_server_ids.elements > 0)
{
errmsg= "Slave configured with server id filtering could not detect the master server id.";
err_code= ER_SLAVE_FATAL_ERROR;
sprintf(err_buff, ER(err_code), errmsg);
goto err;
}
/*
Check that the master's global character_set_server and ours are the same.
@ -1659,6 +1755,10 @@ bool show_master_info(THD* thd, Master_info* mi)
field_list.push_back(new Item_empty_string("Last_IO_Error", 20));
field_list.push_back(new Item_return_int("Last_SQL_Errno", 4, MYSQL_TYPE_LONG));
field_list.push_back(new Item_empty_string("Last_SQL_Error", 20));
field_list.push_back(new Item_empty_string("Replicate_Ignore_Server_Ids",
FN_REFLEN));
field_list.push_back(new Item_return_int("Master_Server_Id", sizeof(ulong),
MYSQL_TYPE_LONG));
if (protocol->send_fields(&field_list,
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
@ -1780,6 +1880,32 @@ bool show_master_info(THD* thd, Master_info* mi)
protocol->store(mi->rli.last_error().number);
// Last_SQL_Error
protocol->store(mi->rli.last_error().message, &my_charset_bin);
// Replicate_Ignore_Server_Ids
{
char buff[FN_REFLEN];
ulong i, cur_len;
for (i= 0, buff[0]= 0, cur_len= 0;
i < mi->ignore_server_ids.elements; i++)
{
ulong s_id, slen;
char sbuff[FN_REFLEN];
get_dynamic(&mi->ignore_server_ids, (uchar*) &s_id, i);
slen= my_sprintf(sbuff, (sbuff, (i==0? "%lu" : ", %lu"), s_id));
if (cur_len + slen + 4 > FN_REFLEN)
{
/*
break the loop whenever remained space could not fit
ellipses on the next cycle
*/
my_sprintf(buff + cur_len, (buff + cur_len, "..."));
break;
}
cur_len += my_sprintf(buff + cur_len, (buff + cur_len, "%s", sbuff));
}
protocol->store(buff, &my_charset_bin);
}
// Master_Server_id
protocol->store((uint32) mi->master_id);
pthread_mutex_unlock(&mi->rli.err_lock);
pthread_mutex_unlock(&mi->err_lock);
@ -3599,6 +3725,7 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len)
ulong inc_pos;
Relay_log_info *rli= &mi->rli;
pthread_mutex_t *log_lock= rli->relay_log.get_log_lock();
ulong s_id;
DBUG_ENTER("queue_event");
LINT_INIT(inc_pos);
@ -3745,9 +3872,20 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len)
*/
pthread_mutex_lock(log_lock);
if ((uint4korr(buf + SERVER_ID_OFFSET) == ::server_id) &&
!mi->rli.replicate_same_server_id)
s_id= uint4korr(buf + SERVER_ID_OFFSET);
if ((s_id == ::server_id && !mi->rli.replicate_same_server_id) ||
/*
the following conjunction deals with IGNORE_SERVER_IDS, if set
If the master is on the ignore list, execution of
format description log events and rotate events is necessary.
*/
(mi->ignore_server_ids.elements > 0 &&
mi->shall_ignore_server_id(s_id) &&
/* everything is filtered out from non-master */
(s_id != mi->master_id ||
/* for the master meta information is necessary */
buf[EVENT_TYPE_OFFSET] != FORMAT_DESCRIPTION_EVENT &&
buf[EVENT_TYPE_OFFSET] != ROTATE_EVENT)))
{
/*
Do not write it to the relay log.
@ -3762,10 +3900,14 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len)
But events which were generated by this slave and which do not exist in
the master's binlog (i.e. Format_desc, Rotate & Stop) should not increment
mi->master_log_pos.
If the event is originated remotely and is being filtered out by
IGNORE_SERVER_IDS it increments mi->master_log_pos
as well as rli->group_relay_log_pos.
*/
if (buf[EVENT_TYPE_OFFSET]!=FORMAT_DESCRIPTION_EVENT &&
buf[EVENT_TYPE_OFFSET]!=ROTATE_EVENT &&
buf[EVENT_TYPE_OFFSET]!=STOP_EVENT)
if (!(s_id == ::server_id && !mi->rli.replicate_same_server_id) ||
buf[EVENT_TYPE_OFFSET] != FORMAT_DESCRIPTION_EVENT &&
buf[EVENT_TYPE_OFFSET] != ROTATE_EVENT &&
buf[EVENT_TYPE_OFFSET] != STOP_EVENT)
{
mi->master_log_pos+= inc_pos;
memcpy(rli->ign_master_log_name_end, mi->master_log_name, FN_REFLEN);
@ -3773,8 +3915,8 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len)
rli->ign_master_log_pos_end= mi->master_log_pos;
}
rli->relay_log.signal_update(); // the slave SQL thread needs to re-check
DBUG_PRINT("info", ("master_log_pos: %lu, event originating from the same server, ignored",
(ulong) mi->master_log_pos));
DBUG_PRINT("info", ("master_log_pos: %lu, event originating from %u server, ignored",
(ulong) mi->master_log_pos, uint4korr(buf + SERVER_ID_OFFSET)));
}
else
{

3
sql/sql_lex.h
View File

@ -214,10 +214,11 @@ typedef struct st_lex_master_info
changed variable or if it should be left at old value
*/
enum {LEX_MI_UNCHANGED, LEX_MI_DISABLE, LEX_MI_ENABLE}
ssl, ssl_verify_server_cert, heartbeat_opt;
ssl, ssl_verify_server_cert, heartbeat_opt, repl_ignore_server_ids_opt;
char *ssl_key, *ssl_cert, *ssl_ca, *ssl_capath, *ssl_cipher;
char *relay_log_name;
ulong relay_log_pos;
DYNAMIC_ARRAY repl_ignore_server_ids;
} LEX_MASTER_INFO;

58
sql/sql_repl.cc
View File

@ -1266,26 +1266,27 @@ bool change_master(THD* thd, Master_info* mi)
int thread_mask;
const char* errmsg= 0;
bool need_relay_log_purge= 1;
bool ret= FALSE;
DBUG_ENTER("change_master");
lock_slave_threads(mi);
init_thread_mask(&thread_mask,mi,0 /*not inverse*/);
LEX_MASTER_INFO* lex_mi= &thd->lex->mi;
if (thread_mask) // We refuse if any slave thread is running
{
my_message(ER_SLAVE_MUST_STOP, ER(ER_SLAVE_MUST_STOP), MYF(0));
unlock_slave_threads(mi);
DBUG_RETURN(TRUE);
ret= TRUE;
goto err;
}
thd_proc_info(thd, "Changing master");
LEX_MASTER_INFO* lex_mi= &thd->lex->mi;
// TODO: see if needs re-write
if (init_master_info(mi, master_info_file, relay_log_info_file, 0,
thread_mask))
{
my_message(ER_MASTER_INFO, ER(ER_MASTER_INFO), MYF(0));
unlock_slave_threads(mi);
DBUG_RETURN(TRUE);
ret= TRUE;
goto err;
}
/*
@ -1330,6 +1331,34 @@ bool change_master(THD* thd, Master_info* mi)
mi->heartbeat_period= (float) min(SLAVE_MAX_HEARTBEAT_PERIOD,
(slave_net_timeout/2.0));
mi->received_heartbeats= LL(0); // counter lives until master is CHANGEd
/*
reset the last time server_id list if the current CHANGE MASTER
is mentioning IGNORE_SERVER_IDS= (...)
*/
if (lex_mi->repl_ignore_server_ids_opt == LEX_MASTER_INFO::LEX_MI_ENABLE)
reset_dynamic(&mi->ignore_server_ids);
for (uint i= 0; i < lex_mi->repl_ignore_server_ids.elements; i++)
{
ulong s_id;
get_dynamic(&lex_mi->repl_ignore_server_ids, (uchar*) &s_id, i);
if (s_id == ::server_id && replicate_same_server_id)
{
my_error(ER_SLAVE_IGNORE_SERVER_IDS, MYF(0), s_id);
ret= TRUE;
goto err;
}
else
{
if (bsearch((const ulong *) &s_id,
mi->ignore_server_ids.buffer,
mi->ignore_server_ids.elements, sizeof(ulong),
(int (*) (const void*, const void*))
change_master_server_id_cmp) == NULL)
insert_dynamic(&mi->ignore_server_ids, (uchar*) &s_id);
}
}
sort_dynamic(&mi->ignore_server_ids, (qsort_cmp) change_master_server_id_cmp);
if (lex_mi->ssl != LEX_MASTER_INFO::LEX_MI_UNCHANGED)
mi->ssl= (lex_mi->ssl == LEX_MASTER_INFO::LEX_MI_ENABLE);
@ -1407,8 +1436,8 @@ bool change_master(THD* thd, Master_info* mi)
if (flush_master_info(mi, 0))
{
my_error(ER_RELAY_LOG_INIT, MYF(0), "Failed to flush master info file");
unlock_slave_threads(mi);
DBUG_RETURN(TRUE);
ret= TRUE;
goto err;
}
if (need_relay_log_purge)
{
@ -1419,8 +1448,8 @@ bool change_master(THD* thd, Master_info* mi)
&errmsg))
{
my_error(ER_RELAY_LOG_FAIL, MYF(0), errmsg);
unlock_slave_threads(mi);
DBUG_RETURN(TRUE);
ret= TRUE;
goto err;
}
}
else
@ -1435,8 +1464,8 @@ bool change_master(THD* thd, Master_info* mi)
&msg, 0))
{
my_error(ER_RELAY_LOG_INIT, MYF(0), msg);
unlock_slave_threads(mi);
DBUG_RETURN(TRUE);
ret= TRUE;
goto err;
}
}
/*
@ -1473,10 +1502,13 @@ bool change_master(THD* thd, Master_info* mi)
pthread_cond_broadcast(&mi->data_cond);
pthread_mutex_unlock(&mi->rli.data_lock);
err:
unlock_slave_threads(mi);
thd_proc_info(thd, 0);
my_ok(thd);
DBUG_RETURN(FALSE);
if (ret == FALSE)
my_ok(thd);
delete_dynamic(&lex_mi->repl_ignore_server_ids); //freeing of parser-time alloc
DBUG_RETURN(ret);
}

23
sql/sql_yacc.yy
View File

@ -740,6 +740,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%token IDENT_QUOTED
%token IF
%token IGNORE_SYM
%token IGNORE_SERVER_IDS_SYM
%token IMPORT
%token INDEXES
%token INDEX_SYM
@ -1559,6 +1560,12 @@ change:
LEX *lex = Lex;
lex->sql_command = SQLCOM_CHANGE_MASTER;
bzero((char*) &lex->mi, sizeof(lex->mi));
/*
resetting flags that can left from the previous CHANGE MASTER
*/
lex->mi.repl_ignore_server_ids_opt= LEX_MASTER_INFO::LEX_MI_UNCHANGED;
my_init_dynamic_array(&Lex->mi.repl_ignore_server_ids,
sizeof(::server_id), 16, 16);
}
master_defs
{}
@ -1661,10 +1668,26 @@ master_def:
}
Lex->mi.heartbeat_opt= LEX_MASTER_INFO::LEX_MI_ENABLE;
}
| IGNORE_SERVER_IDS_SYM EQ '(' ignore_server_id_list ')'
{
Lex->mi.repl_ignore_server_ids_opt= LEX_MASTER_INFO::LEX_MI_ENABLE;
}
|
master_file_def
;
ignore_server_id_list:
/* Empty */
| ignore_server_id
| ignore_server_id_list ',' ignore_server_id
;
ignore_server_id:
ulong_num
{
insert_dynamic(&Lex->mi.repl_ignore_server_ids, (uchar*) &($1));
}
master_file_def:
MASTER_LOG_FILE_SYM EQ TEXT_STRING_sys
{