Commit c2f00cc3 authored by hezx@hezx.(none)'s avatar hezx@hezx.(none)
Browse files

BUG#32205 Replaying statements from mysqlbinlog fails with a syntax error, replicates fine 

The reason of this bug is that when mysqlbinlog dumps a query, the query is written to
output with a delimeter appended right after it, if the query string ends with a '--'
comment, then the delimeter would be considered as part of the comment, if there are any
statements after this query, then it will cause a syntax error.

Start a newline before appending delimiter after a query string
parent a85e8a3f

mysql-test/r/binlog_start_comment.result

0 → 100644
+13 −0
Original line number Diff line number Diff line 
drop table if exists t1,t2;

create table t1 (word varchar(20)) -- create table t1;

create table t2 (word varchar(20)) -- create table t2;

load data infile '../std_data_ln/words.dat' into table t1 -- load data to t1;

insert into t2 values ("Ada");

flush logs;

select * from t2;

word

Ada

flush logs;

select * from t2;

word

Ada

mysql-test/r/ctype_ucs_binlog.result

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

insert into t2 values (@v)/*!*/;

insert into t2 values (@v)

/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

mysql-test/r/mix_innodb_myisam_binlog.result

+2 −2
Original line number Diff line number Diff line
@@ -275,9 +275,9 @@ is not null; 
is not null

1

select

@a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%",

@a like "%#%error_code=0%ROLLBACK\n/*!*/;%ROLLBACK /* added by mysqlbinlog */;%",

@a not like "%#%error_code=%error_code=%";

@a like "%#%error_code=0%ROLLBACK/*!*/;%ROLLBACK /* added by mysqlbinlog */;%"	@a not like "%#%error_code=%error_code=%"

@a like "%#%error_code=0%ROLLBACK\n/*!*/;%ROLLBACK /* added by mysqlbinlog */;%"	@a not like "%#%error_code=%error_code=%"

1	1

drop table t1, t2;

create temporary table tt (a int unique);

mysql-test/r/mysqlbinlog.result

+72 −36
Original line number Diff line number Diff line
@@ -23,24 +23,33 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

drop table if exists t1,t2,t3,t4,t5,t03,t04/*!*/;

drop table if exists t1,t2,t3,t4,t5,t03,t04

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

create table t1 (word varchar(20))/*!*/;

create table t1 (word varchar(20))

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

create table t2 (id int auto_increment not null primary key)/*!*/;

create table t2 (id int auto_increment not null primary key)

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t1 values ("abirvalg")/*!*/;

insert into t1 values ("abirvalg")

/*!*/;

SET INSERT_ID=1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t2 values ()/*!*/;

insert into t2 values ()

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-1-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-1-0' INTO table t1

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-2-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-2-0' INTO table t1

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-3-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-3-0' INTO table t1

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-4-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-4-0' INTO table t1

/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;
@@ -56,7 +65,8 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

insert into t1 values ("Alas")/*!*/;

insert into t1 values ("Alas")

/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;
@@ -83,7 +93,8 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

insert into t1 values ("Alas")/*!*/;

insert into t1 values ("Alas")

/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;
@@ -100,24 +111,33 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

drop table if exists t1,t2,t3,t4,t5,t03,t04/*!*/;

drop table if exists t1,t2,t3,t4,t5,t03,t04

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

create table t1 (word varchar(20))/*!*/;

create table t1 (word varchar(20))

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

create table t2 (id int auto_increment not null primary key)/*!*/;

create table t2 (id int auto_increment not null primary key)

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t1 values ("abirvalg")/*!*/;

insert into t1 values ("abirvalg")

/*!*/;

SET INSERT_ID=1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t2 values ()/*!*/;

insert into t2 values ()

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-1-2' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-1-2' INTO table t1

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-2-2' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-2-2' INTO table t1

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-3-2' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-3-2' INTO table t1

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-4-2' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-4-2' INTO table t1

/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;
@@ -133,7 +153,8 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

insert into t1 values ("Alas")/*!*/;

insert into t1 values ("Alas")

/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;
@@ -160,7 +181,8 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

insert into t1 values ("Alas")/*!*/;

insert into t1 values ("Alas")

/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;
@@ -173,9 +195,11 @@ DELIMITER /*!*/; 
ROLLBACK/*!*/;

use test/*!*/;

SET TIMESTAMP=1108844556/*!*/;

BEGIN/*!*/;

BEGIN

/*!*/;

SET TIMESTAMP=1108844555/*!*/;

insert t1 values (1)/*!*/;

insert t1 values (1)

/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;
@@ -185,9 +209,11 @@ ROLLBACK /* added by mysqlbinlog */; 
DELIMITER /*!*/;

use test/*!*/;

SET TIMESTAMP=1108844556/*!*/;

BEGIN/*!*/;

BEGIN

/*!*/;

SET TIMESTAMP=1108844555/*!*/;

insert t1 values (1)/*!*/;

insert t1 values (1)

/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;
@@ -245,7 +271,8 @@ SET @@session.character_set_client=8,@@session.collation_connection=8,@@session. 
CREATE DEFINER=`root`@`localhost` procedure p1()

begin

select 1;

end/*!*/;

end

/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;
@@ -287,27 +314,36 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

create table t1 (a varchar(64) character set utf8)/*!*/;

create table t1 (a varchar(64) character set utf8)

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-6-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-6-0' INTO table t1

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.collation_database=7/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-7-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-7-0' INTO table t1

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.collation_database=DEFAULT/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-8-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-8-0' INTO table t1

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-9-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-9-0' INTO table t1

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.collation_database=7/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-a-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-a-0' INTO table t1

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

SET @@session.collation_database=DEFAULT/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-b-0' INTO table t1/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-b-0' INTO table t1

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-c-0' INTO table t1 character set koi8r/*!*/;

load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-c-0' INTO table t1 character set koi8r

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

drop table t1/*!*/;

drop table t1

/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

mysql-test/r/rpl_charset.result

+46 −23
Original line number Diff line number Diff line
@@ -183,78 +183,101 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

drop database if exists mysqltest2/*!*/;

drop database if exists mysqltest2

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

drop database if exists mysqltest3/*!*/;

drop database if exists mysqltest3

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

create database mysqltest2 character set latin2/*!*/;

create database mysqltest2 character set latin2

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=30/*!*/;

create database mysqltest3/*!*/;

create database mysqltest3

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=64/*!*/;

drop database mysqltest3/*!*/;

drop database mysqltest3

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

create database mysqltest3/*!*/;

create database mysqltest3

/*!*/;

use mysqltest2/*!*/;

SET TIMESTAMP=1000000000/*!*/;

create table t1 (a int auto_increment primary key, b varchar(100))/*!*/;

create table t1 (a int auto_increment primary key, b varchar(100))

/*!*/;

SET INSERT_ID=1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

/*!\C cp850 *//*!*/;

SET @@session.character_set_client=4,@@session.collation_connection=27,@@session.collation_server=64/*!*/;

insert into t1 (b) values(@@character_set_server)/*!*/;

insert into t1 (b) values(@@character_set_server)

/*!*/;

SET INSERT_ID=2/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t1 (b) values(@@collation_server)/*!*/;

insert into t1 (b) values(@@collation_server)

/*!*/;

SET INSERT_ID=3/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t1 (b) values(@@character_set_client)/*!*/;

insert into t1 (b) values(@@character_set_client)

/*!*/;

SET INSERT_ID=4/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t1 (b) values(@@character_set_connection)/*!*/;

insert into t1 (b) values(@@character_set_connection)

/*!*/;

SET INSERT_ID=5/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t1 (b) values(@@collation_connection)/*!*/;

insert into t1 (b) values(@@collation_connection)

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=5,@@session.collation_server=64/*!*/;

truncate table t1/*!*/;

truncate table t1

/*!*/;

SET INSERT_ID=1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t1 (b) values(@@collation_connection)/*!*/;

insert into t1 (b) values(@@collation_connection)

/*!*/;

SET INSERT_ID=2/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t1 (b) values(LEAST("Mller","Muffler"))/*!*/;

insert into t1 (b) values(LEAST("Mller","Muffler"))

/*!*/;

SET INSERT_ID=3/*!*/;

SET TIMESTAMP=1000000000/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=31,@@session.collation_server=64/*!*/;

insert into t1 (b) values(@@collation_connection)/*!*/;

insert into t1 (b) values(@@collation_connection)

/*!*/;

SET INSERT_ID=4/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t1 (b) values(LEAST("Mller","Muffler"))/*!*/;

insert into t1 (b) values(LEAST("Mller","Muffler"))

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

truncate table t1/*!*/;

truncate table t1

/*!*/;

SET INSERT_ID=1/*!*/;

SET @`a`:=_cp850 0x4DFC6C6C6572 COLLATE `cp850_general_ci`/*!*/;

SET TIMESTAMP=1000000000/*!*/;

insert into t1 (b) values(collation(@a))/*!*/;

insert into t1 (b) values(collation(@a))

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

drop database mysqltest2/*!*/;

drop database mysqltest2

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

drop database mysqltest3/*!*/;

drop database mysqltest3

/*!*/;

use test/*!*/;

SET TIMESTAMP=1000000000/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=30/*!*/;

CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255))/*!*/;

CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255))

/*!*/;

SET TIMESTAMP=1000000000/*!*/;

/*!\C koi8r *//*!*/;

SET @@session.character_set_client=7,@@session.collation_connection=51,@@session.collation_server=30/*!*/;

INSERT INTO t1 (c1, c2) VALUES (',  ',',  ')/*!*/;

INSERT INTO t1 (c1, c2) VALUES (',  ',',  ')

/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;