Commit 0b0abf2b authored by unknown's avatar unknown
Browse files

Merge rsomla@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 

into  quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl


sql/slave.cc:
  Auto merged
parents bf9521d2 17b3cbe8

mysql-test/r/ctype_cp932_binlog_stm.result

+6 −6
Original line number Diff line number Diff line
@@ -30,17 +30,17 @@ HEX(s1) HEX(s2) d 
466F6F2773206120426172	ED40ED41ED42	47.93

DROP PROCEDURE bug18293|

DROP TABLE t4|

SHOW BINLOG EVENTS FROM 397|

SHOW BINLOG EVENTS FROM 406|

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	397	Query	1	560	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,

master-bin.000001	406	Query	1	572	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,

s2 CHAR(50) CHARACTER SET cp932,

d DECIMAL(10,2))

master-bin.000001	560	Query	1	805	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50),

master-bin.000001	572	Query	1	820	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	805	Query	1	1021	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))

master-bin.000001	1021	Query	1	1107	use `test`; DROP PROCEDURE bug18293

master-bin.000001	1107	Query	1	1183	use `test`; DROP TABLE t4
 
master-bin.000001	820	Query	1	1039	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))

master-bin.000001	1039	Query	1	1128	use `test`; DROP PROCEDURE bug18293

master-bin.000001	1128	Query	1	1207	use `test`; DROP TABLE t4

mysql-test/r/mysqlbinlog.result

+58 −0
Original line number Diff line number Diff line
@@ -274,3 +274,61 @@ call p1(); 
1

drop procedure p1;

flush logs;

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

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set character_set_database=koi8r;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set character_set_database=latin1;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set character_set_database=koi8r;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set character_set_database=latin1;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

load data infile '../std_data_ln/loaddata6.dat' into table t1 character set koi8r;

select hex(a) from t1;

hex(a)

C3BF

D0AA

C3BF

C3BF

D0AA

C3BF

D0AA

drop table t1;

flush logs;

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

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

DELIMITER /*!*/;

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/*!*/;

/*!\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)/*!*/;

SET TIMESTAMP=1000000000/*!*/;

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

SET TIMESTAMP=1000000000/*!*/;

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

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

SET TIMESTAMP=1000000000/*!*/;

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

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

SET TIMESTAMP=1000000000/*!*/;

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

SET TIMESTAMP=1000000000/*!*/;

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

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

SET TIMESTAMP=1000000000/*!*/;

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

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

SET TIMESTAMP=1000000000/*!*/;

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

SET TIMESTAMP=1000000000/*!*/;

drop table t1/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

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

flush logs;

mysql-test/r/rpl_loaddata_charset.result

0 → 100644
+37 −0
Original line number Diff line number Diff line 
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;

create table t1 (a varchar(10) character set utf8);

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set @@character_set_database=koi8r;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set @@character_set_database=DEFAULT;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set @@character_set_database=koi8r;

load data infile '../std_data_ln/loaddata6.dat' into table t1;

set @@character_set_database=DEFAULT;

load data infile '../std_data_ln/loaddata6.dat' into table t1 character set koi8r;

select hex(a) from t1;

hex(a)

C3BF

D0AA

C3BF

C3BF

C3BF

D0AA

D0AA

select hex(a) from t1;

hex(a)

C3BF

D0AA

C3BF

C3BF

C3BF

D0AA

D0AA

drop table t1;

mysql-test/r/rpl_replicate_do.result

+34 −0
Original line number Diff line number Diff line
@@ -41,3 +41,37 @@ select * from t1; 
ts

2005-08-12 00:00:00

drop table t1;

*** master ***

create table t1 (a int, b int);

create trigger trg1 before insert on t1 for each row set new.b=2;

create table t2 (a int, b int);

create trigger trg2 before insert on t2 for each row set new.b=2;

show tables;

Tables_in_test

t1

t2

show triggers;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

trg1	INSERT	t1	set new.b=2	BEFORE	NULL		root@localhost

trg2	INSERT	t2	set new.b=2	BEFORE	NULL		root@localhost

*** slave ***

show tables;

Tables_in_test

t1

show triggers;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

trg1	INSERT	t1	set new.b=2	BEFORE	NULL		root@localhost

*** master ***

drop trigger trg1;

drop trigger trg2;

show triggers;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

*** slave ***

show tables;

Tables_in_test

t1

show triggers;

Trigger	Event	Table	Statement	Timing	Created	sql_mode	Definer

*** master ***

drop table t1;

drop table t2;