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

Merge hezx.(none):/media/sda3/work/mysql/bkwork/bug#32205/5.1 

into  hezx.(none):/media/sda3/work/mysql/bkwork/bug#32205/mysql-5.1-new-rpl
parents 8b22f0a1 3255237f

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 */;
@@ -246,7 +272,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 */;
@@ -288,27 +315,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/mysqlbinlog2.result

+226 −113

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/r/user_var-binlog.result

+4 −2
Original line number Diff line number Diff line
@@ -25,11 +25,13 @@ 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(@`a b`)/*!*/;

INSERT INTO t1 VALUES(@`a b`)

/*!*/;

SET @`var1`:=_latin1 0x273B616161 COLLATE `latin1_swedish_ci`/*!*/;

SET @`var2`:=_binary 0x61 COLLATE `binary`/*!*/;

SET TIMESTAMP=10000/*!*/;

insert into t1 values (@var1),(@var2)/*!*/;

insert into t1 values (@var1),(@var2)

/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

mysql-test/suite/binlog/r/binlog_start_comment.result

0 → 100644
+15 −0
Original line number Diff line number Diff line 
reset master;

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

drop table t1,t2;

mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,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 */;