Commit c41a485d authored by unknown's avatar unknown
Browse files

Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0 

into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
parents 2c1ef3c6 2ffc8022

client/mysqlbinlog.cc

+15 −0
Original line number Diff line number Diff line
@@ -1249,6 +1249,14 @@ int main(int argc, char** argv) 
    fprintf(result_file,

            "/*!32316 SET @OLD_SQL_LOG_BIN=@@SQL_LOG_BIN, SQL_LOG_BIN=0*/;\n");



  /*

    In mysqlbinlog|mysql, don't want mysql to be disconnected after each

    transaction (which would be the case with GLOBAL.COMPLETION_TYPE==2).

  */

  fprintf(result_file,

          "/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,"

          "COMPLETION_TYPE=0*/;\n");



  for (save_stop_position= stop_position, stop_position= ~(my_off_t)0 ;

       (--argc >= 0) && !stop_passed ; )

  {
@@ -1263,6 +1271,13 @@ int main(int argc, char** argv) 
    start_position= BIN_LOG_HEADER_SIZE;

  }



  /*

    Issue a ROLLBACK in case the last printed binlog was crashed and had half

    of transaction.

  */

  fprintf(result_file,

          "ROLLBACK;\n"

          "/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;\n");

  if (disable_log_bin)

    fprintf(result_file, "/*!32316 SET SQL_LOG_BIN=@OLD_SQL_LOG_BIN*/;\n");

mysql-test/r/ctype_ucs.result

+3 −0
Original line number Diff line number Diff line
@@ -528,6 +528,7 @@ Log_name Pos Event_type Server_id End_log_pos Info 
master-bin.000001	96	User var	1	136	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci

master-bin.000001	136	Query	1	226	use `test`; insert into t2 values (@v)

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`;

use test;
@@ -536,6 +537,8 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t2 values (@v);

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;

drop table t2;

set names latin1;

create table t1 (a enum('x','y','z') character set ucs2);

mysql-test/r/mysqlbinlog.result

+30 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ flush logs; 


--- Local --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1000000000;
@@ -36,32 +37,44 @@ LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-2-0' INTO TABLE `t1` FI 
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-3-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);

LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-4-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);

LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-5-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- Broken LOAD DATA --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

use test;

SET TIMESTAMP=1000000000;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;

SET @@session.sql_mode=0;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values ("Alas");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- --database --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

SET INSERT_ID=1;

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- --position --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

use test;

SET TIMESTAMP=1000000000;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;

SET @@session.sql_mode=0;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values ("Alas");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- Remote --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1000000000;
@@ -83,42 +96,59 @@ LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-2-1' INTO TABLE `t1` FI 
LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-3-1' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);

LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-4-1' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);

LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-5-1' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word);

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- Broken LOAD DATA --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

use test;

SET TIMESTAMP=1000000000;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;

SET @@session.sql_mode=0;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values ("Alas");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- --database --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

SET INSERT_ID=1;

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- --position --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

use test;

SET TIMESTAMP=1000000000;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;

SET @@session.sql_mode=0;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values ("Alas");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- reading stdin --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1108844556;

BEGIN;

SET TIMESTAMP=1108844555;

insert t1 values (1);

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

use test;

SET TIMESTAMP=1108844556;

BEGIN;

SET TIMESTAMP=1108844555;

insert t1 values (1);

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;

drop table t1, t2;

mysql-test/r/mysqlbinlog2.result

+75 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ insert into t1 values(null, "f"); 


--- Local --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1579609942;
@@ -38,9 +39,12 @@ insert into t1 values(null, "d"); 
SET INSERT_ID=5;

SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- offset --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

SET INSERT_ID=1;

use test;
@@ -61,9 +65,12 @@ insert into t1 values(null, "d"); 
SET INSERT_ID=5;

SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-position --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

SET INSERT_ID=4;

use test;

SET TIMESTAMP=1579609946;
@@ -74,9 +81,12 @@ insert into t1 values(null, "d"); 
SET INSERT_ID=5;

SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-position --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1579609942;
@@ -93,9 +103,12 @@ insert into t1 values(null, "b"); 
SET INSERT_ID=3;

SET TIMESTAMP=1579609944;

insert into t1 values(null, "c");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-datetime --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

SET INSERT_ID=3;

use test;
@@ -110,9 +123,12 @@ insert into t1 values(null, "d"); 
SET INSERT_ID=5;

SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-datetime --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1579609942;
@@ -126,9 +142,12 @@ insert into t1 values(null, "a"); 
SET INSERT_ID=2;

SET TIMESTAMP=1579609942;

insert into t1 values(null, "b");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- Local with 2 binlogs on command line --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1579609942;
@@ -158,9 +177,12 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- offset --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

SET INSERT_ID=1;

use test;
@@ -188,9 +210,12 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-position --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

SET INSERT_ID=4;

use test;

SET TIMESTAMP=1579609946;
@@ -208,9 +233,12 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-position --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1579609942;
@@ -234,9 +262,12 @@ SET INSERT_ID=5; 
SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

SET INSERT_ID=6;

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-datetime --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

SET INSERT_ID=3;

use test;
@@ -258,9 +289,12 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-datetime --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1579609942;
@@ -274,9 +308,12 @@ insert into t1 values(null, "a"); 
SET INSERT_ID=2;

SET TIMESTAMP=1579609942;

insert into t1 values(null, "b");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- Remote --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1579609942;
@@ -299,9 +336,12 @@ insert into t1 values(null, "d"); 
SET INSERT_ID=5;

SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- offset --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

SET INSERT_ID=1;

use test;
@@ -322,9 +362,12 @@ insert into t1 values(null, "d"); 
SET INSERT_ID=5;

SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-position --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

SET INSERT_ID=4;

use test;

SET TIMESTAMP=1579609946;
@@ -335,9 +378,12 @@ insert into t1 values(null, "d"); 
SET INSERT_ID=5;

SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-position --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1579609942;
@@ -354,9 +400,12 @@ insert into t1 values(null, "b"); 
SET INSERT_ID=3;

SET TIMESTAMP=1579609944;

insert into t1 values(null, "c");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-datetime --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

SET INSERT_ID=3;

use test;
@@ -371,9 +420,12 @@ insert into t1 values(null, "d"); 
SET INSERT_ID=5;

SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-datetime --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1579609942;
@@ -387,9 +439,12 @@ insert into t1 values(null, "a"); 
SET INSERT_ID=2;

SET TIMESTAMP=1579609942;

insert into t1 values(null, "b");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- Remote with 2 binlogs on command line --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1579609942;
@@ -419,9 +474,12 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- offset --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

SET INSERT_ID=1;

use test;
@@ -449,9 +507,12 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-position --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

SET INSERT_ID=4;

use test;

SET TIMESTAMP=1579609946;
@@ -469,9 +530,12 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-position --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1579609942;
@@ -495,9 +559,12 @@ SET INSERT_ID=5; 
SET TIMESTAMP=1579609946;

insert into t1 values(null, "e");

SET INSERT_ID=6;

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-datetime --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

SET INSERT_ID=3;

use test;
@@ -519,9 +586,12 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq 
SET @@session.sql_mode=0;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;

insert into t1 values(null, "f");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- stop-datetime --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1579609942;
@@ -535,9 +605,12 @@ insert into t1 values(null, "a"); 
SET INSERT_ID=2;

SET TIMESTAMP=1579609942;

insert into t1 values(null, "b");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- to-last-log --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

ROLLBACK;

use test;

SET TIMESTAMP=1579609942;
@@ -563,6 +636,8 @@ insert into t1 values(null, "e"); 
SET INSERT_ID=6;

SET TIMESTAMP=1579609943;

insert into t1 values(null, "f");

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- end of test --

drop table t1;

mysql-test/r/rpl_charset.result

+3 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ 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*/;

ROLLBACK;

SET TIMESTAMP=1000000000;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -245,6 +246,8 @@ CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255)); 
SET TIMESTAMP=1000000000;

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

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

ROLLBACK;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;

drop table t1;

create table `t1` (

`pk` varchar(10) not null default '',