mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
590350633c
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 mysql-test/r/ctype_ucs_binlog.result: Update test result for BUG#32205 mysql-test/r/mix_innodb_myisam_binlog.result: Update test result for BUG#32205 mysql-test/r/mysqlbinlog.result: Update test result for BUG#32205 mysql-test/r/rpl_charset.result: Update test result for BUG#32205 mysql-test/r/rpl_timezone.result: Update test result for BUG#32205 mysql-test/r/user_var-binlog.result: Update test result for BUG#32205 mysql-test/t/mix_innodb_myisam_binlog.test: Fixed for BUG#32205 sql/log_event.cc: Start a newline before appending delimiter after a query string mysql-test/r/binlog_start_comment.result: Add test for BUG#32205 mysql-test/t/binlog_start_comment.test: Add test for BUG#32205
292 lines
10 KiB
Text
292 lines
10 KiB
Text
stop slave;
|
||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||
reset master;
|
||
reset slave;
|
||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||
start slave;
|
||
set timestamp=1000000000;
|
||
drop database if exists mysqltest2;
|
||
drop database if exists mysqltest3;
|
||
create database mysqltest2 character set latin2;
|
||
set @@character_set_server=latin5;
|
||
create database mysqltest3;
|
||
|
||
--- --master--
|
||
show create database mysqltest2;
|
||
Database Create Database
|
||
mysqltest2 CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET latin2 */
|
||
show create database mysqltest3;
|
||
Database Create Database
|
||
mysqltest3 CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET latin5 */
|
||
|
||
--- --slave--
|
||
show create database mysqltest2;
|
||
Database Create Database
|
||
mysqltest2 CREATE DATABASE `mysqltest2` /*!40100 DEFAULT CHARACTER SET latin2 */
|
||
show create database mysqltest3;
|
||
Database Create Database
|
||
mysqltest3 CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET latin5 */
|
||
set @@collation_server=armscii8_bin;
|
||
drop database mysqltest3;
|
||
create database mysqltest3;
|
||
|
||
--- --master--
|
||
show create database mysqltest3;
|
||
Database Create Database
|
||
mysqltest3 CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii8_bin */
|
||
|
||
--- --slave--
|
||
show create database mysqltest3;
|
||
Database Create Database
|
||
mysqltest3 CREATE DATABASE `mysqltest3` /*!40100 DEFAULT CHARACTER SET armscii8 COLLATE armscii8_bin */
|
||
use mysqltest2;
|
||
create table t1 (a int auto_increment primary key, b varchar(100));
|
||
set character_set_client=cp850, collation_connection=latin2_croatian_ci;
|
||
insert into t1 (b) values(@@character_set_server);
|
||
insert into t1 (b) values(@@collation_server);
|
||
insert into t1 (b) values(@@character_set_client);
|
||
insert into t1 (b) values(@@character_set_connection);
|
||
insert into t1 (b) values(@@collation_connection);
|
||
|
||
--- --master--
|
||
select * from t1 order by a;
|
||
a b
|
||
1 armscii8
|
||
2 armscii8_bin
|
||
3 cp850
|
||
4 latin2
|
||
5 latin2_croatian_ci
|
||
|
||
--- --slave--
|
||
select * from mysqltest2.t1 order by a;
|
||
a b
|
||
1 armscii8
|
||
2 armscii8_bin
|
||
3 cp850
|
||
4 latin2
|
||
5 latin2_croatian_ci
|
||
set character_set_client=latin1, collation_connection=latin1_german1_ci;
|
||
truncate table t1;
|
||
insert into t1 (b) values(@@collation_connection);
|
||
insert into t1 (b) values(LEAST("M<>ller","Muffler"));
|
||
set collation_connection=latin1_german2_ci;
|
||
insert into t1 (b) values(@@collation_connection);
|
||
insert into t1 (b) values(LEAST("M<>ller","Muffler"));
|
||
|
||
--- --master--
|
||
select * from t1 order by a;
|
||
a b
|
||
1 latin1_german1_ci
|
||
2 Muffler
|
||
3 latin1_german2_ci
|
||
4 M<>ller
|
||
|
||
--- --slave--
|
||
select * from mysqltest2.t1 order by a;
|
||
a b
|
||
1 latin1_german1_ci
|
||
2 Muffler
|
||
3 latin1_german2_ci
|
||
4 M<>ller
|
||
set @a= _cp850 'M<>ller' collate cp850_general_ci;
|
||
truncate table t1;
|
||
insert into t1 (b) values(collation(@a));
|
||
|
||
--- --master--
|
||
select * from t1 order by a;
|
||
a b
|
||
1 cp850_general_ci
|
||
|
||
--- --slave--
|
||
select * from mysqltest2.t1 order by a;
|
||
a b
|
||
1 cp850_general_ci
|
||
drop database mysqltest2;
|
||
drop database mysqltest3;
|
||
show binlog events from 98;
|
||
Log_name Pos Event_type Server_id End_log_pos Info
|
||
master-bin.000001 # Query 1 # drop database if exists mysqltest2
|
||
master-bin.000001 # Query 1 # drop database if exists mysqltest3
|
||
master-bin.000001 # Query 1 # create database mysqltest2 character set latin2
|
||
master-bin.000001 # Query 1 # create database mysqltest3
|
||
master-bin.000001 # Query 1 # drop database mysqltest3
|
||
master-bin.000001 # Query 1 # create database mysqltest3
|
||
master-bin.000001 # Query 1 # use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100))
|
||
master-bin.000001 # Intvar 1 # INSERT_ID=1
|
||
master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(@@character_set_server)
|
||
master-bin.000001 # Intvar 1 # INSERT_ID=2
|
||
master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(@@collation_server)
|
||
master-bin.000001 # Intvar 1 # INSERT_ID=3
|
||
master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(@@character_set_client)
|
||
master-bin.000001 # Intvar 1 # INSERT_ID=4
|
||
master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(@@character_set_connection)
|
||
master-bin.000001 # Intvar 1 # INSERT_ID=5
|
||
master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(@@collation_connection)
|
||
master-bin.000001 # Query 1 # use `mysqltest2`; truncate table t1
|
||
master-bin.000001 # Intvar 1 # INSERT_ID=1
|
||
master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(@@collation_connection)
|
||
master-bin.000001 # Intvar 1 # INSERT_ID=2
|
||
master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(LEAST("M<>ller","Muffler"))
|
||
master-bin.000001 # Intvar 1 # INSERT_ID=3
|
||
master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(@@collation_connection)
|
||
master-bin.000001 # Intvar 1 # INSERT_ID=4
|
||
master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(LEAST("M<>ller","Muffler"))
|
||
master-bin.000001 # Query 1 # use `mysqltest2`; truncate table t1
|
||
master-bin.000001 # Intvar 1 # INSERT_ID=1
|
||
master-bin.000001 # User var 1 # @`a`=_cp850 0x4DFC6C6C6572 COLLATE cp850_general_ci
|
||
master-bin.000001 # Query 1 # use `mysqltest2`; insert into t1 (b) values(collation(@a))
|
||
master-bin.000001 # Query 1 # drop database mysqltest2
|
||
master-bin.000001 # Query 1 # drop database mysqltest3
|
||
set global character_set_server=latin2;
|
||
set global character_set_server=latin1;
|
||
set global character_set_server=latin2;
|
||
set global character_set_server=latin1;
|
||
set one_shot @@character_set_server=latin5;
|
||
set @@max_join_size=1000;
|
||
select @@character_set_server;
|
||
@@character_set_server
|
||
latin5
|
||
select @@character_set_server;
|
||
@@character_set_server
|
||
latin1
|
||
set @@character_set_server=latin5;
|
||
select @@character_set_server;
|
||
@@character_set_server
|
||
latin5
|
||
select @@character_set_server;
|
||
@@character_set_server
|
||
latin5
|
||
set one_shot max_join_size=10;
|
||
ERROR HY000: The 'SET ONE_SHOT' syntax is reserved for purposes internal to the MySQL server
|
||
set character_set_client=9999999;
|
||
ERROR 42000: Unknown character set: '9999999'
|
||
set collation_server=9999998;
|
||
ERROR HY000: Unknown collation: '9999998'
|
||
use test;
|
||
CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255));
|
||
SET CHARACTER_SET_CLIENT=koi8r,
|
||
CHARACTER_SET_CONNECTION=cp1251,
|
||
CHARACTER_SET_RESULTS=koi8r;
|
||
INSERT INTO t1 (c1, c2) VALUES ('<27><>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>','<27><>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>');
|
||
select hex(c1), hex(c2) from t1;
|
||
hex(c1) hex(c2)
|
||
CDF32C20E7E020F0FBE1E0EBEAF3 CDF32C20E7E020F0FBE1E0EBEAF3
|
||
select hex(c1), hex(c2) from t1;
|
||
hex(c1) hex(c2)
|
||
CDF32C20E7E020F0FBE1E0EBEAF3 CDF32C20E7E020F0FBE1E0EBEAF3
|
||
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
|
||
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
|
||
DELIMITER /*!*/;
|
||
ROLLBACK/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;
|
||
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
|
||
/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
drop database if exists mysqltest3
|
||
/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
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
|
||
/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
/*!\C latin1 *//*!*/;
|
||
SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=64/*!*/;
|
||
drop database mysqltest3
|
||
/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
create database mysqltest3
|
||
/*!*/;
|
||
use mysqltest2/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
create table t1 (a int auto_increment primary key, b varchar(100))
|
||
/*!*/;
|
||
SET INSERT_ID=1/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
/*!\C cp850 *//*!*/;
|
||
SET @@session.character_set_client=4,@@session.collation_connection=27,@@session.collation_server=64/*!*/;
|
||
insert into t1 (b) values(@@character_set_server)
|
||
/*!*/;
|
||
SET INSERT_ID=2/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
insert into t1 (b) values(@@collation_server)
|
||
/*!*/;
|
||
SET INSERT_ID=3/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
insert into t1 (b) values(@@character_set_client)
|
||
/*!*/;
|
||
SET INSERT_ID=4/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
insert into t1 (b) values(@@character_set_connection)
|
||
/*!*/;
|
||
SET INSERT_ID=5/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
insert into t1 (b) values(@@collation_connection)
|
||
/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
/*!\C latin1 *//*!*/;
|
||
SET @@session.character_set_client=8,@@session.collation_connection=5,@@session.collation_server=64/*!*/;
|
||
truncate table t1
|
||
/*!*/;
|
||
SET INSERT_ID=1/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
insert into t1 (b) values(@@collation_connection)
|
||
/*!*/;
|
||
SET INSERT_ID=2/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
insert into t1 (b) values(LEAST("M<>ller","Muffler"))
|
||
/*!*/;
|
||
SET INSERT_ID=3/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
/*!\C latin1 *//*!*/;
|
||
SET @@session.character_set_client=8,@@session.collation_connection=31,@@session.collation_server=64/*!*/;
|
||
insert into t1 (b) values(@@collation_connection)
|
||
/*!*/;
|
||
SET INSERT_ID=4/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
insert into t1 (b) values(LEAST("M<>ller","Muffler"))
|
||
/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
truncate table t1
|
||
/*!*/;
|
||
SET INSERT_ID=1/*!*/;
|
||
SET @`a`:=_cp850 0x4DFC6C6C6572 COLLATE `cp850_general_ci`/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
insert into t1 (b) values(collation(@a))
|
||
/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
drop database mysqltest2
|
||
/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
drop database mysqltest3
|
||
/*!*/;
|
||
use test/*!*/;
|
||
SET TIMESTAMP=1000000000/*!*/;
|
||
/*!\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))
|
||
/*!*/;
|
||
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 ('<27><>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>','<27><>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>')
|
||
/*!*/;
|
||
DELIMITER ;
|
||
# End of log file
|
||
ROLLBACK /* added by mysqlbinlog */;
|
||
/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
|
||
drop table t1;
|
||
create table `t1` (
|
||
`pk` varchar(10) not null default '',
|
||
primary key (`pk`)
|
||
) engine=myisam default charset=latin1;
|
||
set @p=_latin1 'test';
|
||
update t1 set pk='test' where pk=@p;
|
||
drop table t1;
|