Commit de61d5b0 authored by unknown's avatar unknown
Browse files

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 

into  mysql.com:/home/bar/mysql-5.0.b15126


sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  After merge fix
mysql-test/t/mysqlbinlog.test:
  After merge fix
parents 9c8637dc c3a3aff5

mysql-test/r/mysqlbinlog.result

+59 −0
Original line number Diff line number Diff line
@@ -272,3 +272,62 @@ call p1(); 
1

1

drop procedure p1;

drop table t1, t2, t03, t04, t3, t4, t5;

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 '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-6-0' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

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

load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-7-0' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

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

load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-8-0' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-9-0' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

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

load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-a-0' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

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

load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/SQL_LOAD_MB-b-0' INTO table t1/*!*/;

SET TIMESTAMP=1000000000/*!*/;

load data LOCAL INFILE '/home/bar/mysql-5.0.b15126/mysql-test/var/tmp/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*/;

mysql-test/r/rpl_loaddata2.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/std_data/loaddata6.dat

0 → 100644
+1 −0
Original line number Diff line number Diff line

mysql-test/t/mysqlbinlog.test

+26 −0
Original line number Diff line number Diff line
@@ -189,5 +189,31 @@ drop procedure p1; 
--exec $MYSQL_BINLOG --version 2>&1 > /dev/null

--exec $MYSQL_BINLOG --help 2>&1 > /dev/null

--enable_query_log

# clean up

drop table t1, t2, t03, t04, t3, t4, t5; 



#

# Bug#15126 character_set_database is not replicated

# (LOAD DATA INFILE need it)

#



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;

drop table t1;

flush logs;

--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000011



# End of 5.0 tests

mysql-test/t/rpl_loaddata2.test

0 → 100644
+33 −0
Original line number Diff line number Diff line 
#

# Check LOAD DATA + character sets + replication

#

source include/master-slave.inc;



#

# Bug#15126 character_set_database is not replicated

# (LOAD DATA INFILE need it)

#

connection master;

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;



save_master_pos;

connection slave;

sync_with_master;



select hex(a) from t1;

connection master;

drop table t1;

sync_slave_with_master;