Commit f9a38a9e authored by tomas@poseidon.ndb.mysql.com's avatar tomas@poseidon.ndb.mysql.com
Browse files

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-rpl-merge 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
parents cc6c6963 b1fadc4c

mysql-test/extra/rpl_tests/rpl_stm_charset.test→mysql-test/extra/rpl_tests/rpl_charset.test

+6 −26
Original line number Diff line number Diff line 
# Replication of character sets.

# This test will fail if the server/client does not support enough charsets.



# Requires statement logging

-- source include/have_binlog_format_mixed_or_statement.inc



source include/master-slave.inc;

--disable_warnings

set timestamp=1000000000;
@@ -52,14 +49,10 @@ insert into t1 (b) values(@@character_set_client); 
# collation_client does not exist

insert into t1 (b) values(@@character_set_connection);

insert into t1 (b) values(@@collation_connection);

--disable_query_log

select "--- --master--" as "";

--enable_query_log

--echo --- --master--

select * from t1 order by a;

sync_slave_with_master;

--disable_query_log

select "--- --slave--" as "";

--enable_query_log

--echo --- --slave--

select * from mysqltest2.t1 order by a;



connection master;
@@ -70,14 +63,10 @@ insert into t1 (b) values(LEAST("M 
set collation_connection=latin1_german2_ci;

insert into t1 (b) values(@@collation_connection);

insert into t1 (b) values(LEAST("Müller","Muffler"));

--disable_query_log

select "--- --master--" as "";

--enable_query_log

--echo --- --master--

select * from t1 order by a;

sync_slave_with_master;

--disable_query_log

select "--- --slave--" as "";

--enable_query_log

--echo --- --slave--

select * from mysqltest2.t1 order by a;



# Presently charset info is not logged with LOAD DATA but it will
@@ -96,20 +85,15 @@ connection master; 
set @a= _cp850 'Müller' collate cp850_general_ci;

truncate table t1;

insert into t1 (b) values(collation(@a));

--disable_query_log

select "--- --master--" as "";

--enable_query_log

--echo --- --master--

select * from t1 order by a;

sync_slave_with_master;

--disable_query_log

select "--- --slave--" as "";

--enable_query_log

--echo --- --slave--

select * from mysqltest2.t1 order by a;



connection master;

drop database mysqltest2;

drop database mysqltest3;

source include/show_binlog_events.inc;

sync_slave_with_master;



# Check that we can change global.collation_server (since 5.0.3)
@@ -153,10 +137,6 @@ sync_slave_with_master; 
select hex(c1), hex(c2) from t1;



connection master;

# Let's have a look at generated SETs.

flush logs;

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

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

drop table t1;

sync_slave_with_master;

mysql-test/extra/rpl_tests/rpl_row_charset.test

deleted100644 → 0
+0 −179
Original line number Diff line number Diff line 
# Replication of character sets.

# This test will fail if the server/client does not support enough charsets.



--disable_warnings

set timestamp=1000000000;

drop database if exists mysqltest2;

drop database if exists mysqltest3;

--enable_warnings



create database mysqltest2 character set latin2;

set @@character_set_server=latin5;      

create database mysqltest3;

--disable_query_log

select "--- --master--" as "";

--enable_query_log

show create database mysqltest2;

show create database mysqltest3;

sync_slave_with_master;

--disable_query_log

select "--- --slave--" as "";

--enable_query_log

show create database mysqltest2;

show create database mysqltest3;



connection master;

set @@collation_server=armscii8_bin;

drop database mysqltest3;

create database mysqltest3;

--disable_query_log

select "--- --master--" as "";

--enable_query_log

show create database mysqltest3;

sync_slave_with_master;

--disable_query_log

select "--- --slave--" as "";

--enable_query_log

show create database mysqltest3;



connection master;

use mysqltest2;

--eval create table t1 (a int auto_increment primary key, b varchar(100))engine=$engine_type;

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);

# character_set_database and collation_database are not tested as they

# needn't be replicated (Bar said in Jan 2005).

insert into t1 (b) values(@@character_set_client);

# collation_client does not exist

insert into t1 (b) values(@@character_set_connection);

insert into t1 (b) values(@@collation_connection);

--disable_query_log

select "--- --master--" as "";

--enable_query_log

select * from t1 order by a;

sync_slave_with_master;

--disable_query_log

select "--- --slave--" as "";

--enable_query_log

select * from mysqltest2.t1 order by a;



select "--- --muller--" as "";

connection master;

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("Mller","Muffler"));

set collation_connection=latin1_german2_ci;

insert into t1 (b) values(@@collation_connection);

insert into t1 (b) values(LEAST("Mller","Muffler"));

--disable_query_log

select "--- --master--" as "";

--enable_query_log

select * from t1 order by a;

sync_slave_with_master;

--disable_query_log

select "--- --slave--" as "";

--enable_query_log

select * from mysqltest2.t1 order by a;



# Presently charset info is not logged with LOAD DATA but it will

# change in Jan 2005 when Dmitri pushes his new LOAD DATA,

# before 5.0.3 goes out. When done, LOAD DATA INFILE should be tested

# here.



# See if user var is prefixed with collation in binlog and replicated well.

# Note: replication of user variables is broken as far as derivation is

# concerned. That's because when we store a user variable in the binlog,

# we lose its derivation. So later on the slave, it's impossible to

# know if the collation was explicit or not, so we use DERIVATION_NONE,

# which provokes error messages (like 'Illegal mix of collation') when

# we replay the master's INSERT/etc statements.





select "--- --INSERT--" as "";

connection master;

set @a= _cp850 'Mller' collate cp850_general_ci;

truncate table t1;

insert into t1 (b) values(collation(@a));

--disable_query_log

select "--- --master--" as "";

--enable_query_log

select * from t1 order by a;

sync_slave_with_master;

--disable_query_log

select "--- --slave--" as "";

--enable_query_log

select * from mysqltest2.t1 order by a;



connection master;

drop database mysqltest2;

drop database mysqltest3;

source include/show_binlog_events.inc;

sync_slave_with_master;



# Check that we can change global.collation_server (since 5.0.3)



select "--- --global--" as "";

set global character_set_server=latin2;

set global character_set_server=latin1; # back

connection master;

set global character_set_server=latin2;

set global character_set_server=latin1; # back



# Check that SET ONE_SHOT is really one shot



select "--- --oneshot--" as "";

set one_shot @@character_set_server=latin5;

set @@max_join_size=1000;

select @@character_set_server;

select @@character_set_server;

set @@character_set_server=latin5;

select @@character_set_server;

select @@character_set_server;



# ONE_SHOT on not charset/collation stuff is not allowed

-- error 1382

set one_shot max_join_size=10;



# Test of wrong character set numbers;

error 1115;

set character_set_client=9999999;

error 1273;

set collation_server=9999998;



# This one was contributed by Sergey Petrunia (BUG#3943)



select "--- --3943--" as "";

use test;

--eval CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255))ENGINE=$engine_type;

SET CHARACTER_SET_CLIENT=koi8r,

 CHARACTER_SET_CONNECTION=cp1251, 

 CHARACTER_SET_RESULTS=koi8r;

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

SET SQL_BIG_SELECTS=1;

select hex(c1), hex(c2) from t1;

sync_slave_with_master;

SET SQL_BIG_SELECTS=1;

select hex(c1), hex(c2) from t1;



connection master;

# Let's have a look at generated SETs.

--replace_result $MYSQLTEST_VARDIR MYSQL_TEST_DIR/var

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

drop table t1;

sync_slave_with_master;



#

#  BUG#6676: Derivation of variables must be correct on slave

#

select "--- --6676--" as "";

connection master;

eval create table `t1` (

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

  primary key (`pk`)

) engine=$engine_type default charset=latin1;

set @p=_latin1 'test';

update t1 set pk='test' where pk=@p;

drop table t1;

sync_slave_with_master;

mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result→mysql-test/suite/rpl/r/rpl_charset.result

+3 −60
Original line number Diff line number Diff line
@@ -40,14 +40,13 @@ 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))engine=NDB;;

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
@@ -56,7 +55,6 @@ a b 
3	cp850

4	latin2

5	latin2_croatian_ci



--- --slave--

select * from mysqltest2.t1 order by a;

a	b
@@ -65,9 +63,6 @@ a b 
3	cp850

4	latin2

5	latin2_croatian_ci

select "--- --muller--" as "";



--- --muller--

set character_set_client=latin1, collation_connection=latin1_german1_ci;

truncate table t1;

insert into t1 (b) values(@@collation_connection);
@@ -75,7 +70,6 @@ insert into t1 (b) values(LEAST("M 
set collation_connection=latin1_german2_ci;

insert into t1 (b) values(@@collation_connection);

insert into t1 (b) values(LEAST("Mller","Muffler"));



--- --master--

select * from t1 order by a;

a	b
@@ -83,7 +77,6 @@ a b 
2	Muffler

3	latin1_german2_ci

4	Mller



--- --slave--

select * from mysqltest2.t1 order by a;

a	b
@@ -91,65 +84,23 @@ a b 
2	Muffler

3	latin1_german2_ci

4	Mller

select "--- --INSERT--" as "";



--- --INSERT--

set @a= _cp850 'Mller' 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 <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	drop database if exists mysqltest2

master-bin.000001	#	Query	#	#	drop database if exists mysqltest3

master-bin.000001	#	Query	#	#	create database mysqltest2 character set latin2

master-bin.000001	#	Query	#	#	create database mysqltest3

master-bin.000001	#	Query	#	#	drop database mysqltest3

master-bin.000001	#	Query	#	#	create database mysqltest3

master-bin.000001	#	Query	#	#	use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100))engine=NDB

master-bin.000001	#	Query	#	#	BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)

master-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)

master-bin.000001	#	Write_rows	#	#	table_id: #

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	COMMIT

master-bin.000001	#	Query	#	#	use `mysqltest2`; truncate table t1

master-bin.000001	#	Query	#	#	BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)

master-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)

master-bin.000001	#	Write_rows	#	#	table_id: #

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	COMMIT

master-bin.000001	#	Query	#	#	use `mysqltest2`; truncate table t1

master-bin.000001	#	Query	#	#	BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)

master-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)

master-bin.000001	#	Write_rows	#	#	table_id: #

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	COMMIT

master-bin.000001	#	Query	#	#	drop database mysqltest2

master-bin.000001	#	Query	#	#	drop database mysqltest3

select "--- --global--" as "";



--- --global--

set global character_set_server=latin2;

set global character_set_server=latin1;

set global character_set_server=latin2;

set global character_set_server=latin1;

select "--- --oneshot--" as "";



--- --oneshot--

set one_shot @@character_set_server=latin5;

set @@max_join_size=1000;

select @@character_set_server;
@@ -171,31 +122,23 @@ set character_set_client=9999999; 
ERROR 42000: Unknown character set: '9999999'

set collation_server=9999998;

ERROR HY000: Unknown collation: '9999998'

select "--- --3943--" as "";



--- --3943--

use test;

CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255))ENGINE=NDB;;

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 (',  ',',  ');

SET SQL_BIG_SELECTS=1;

select hex(c1), hex(c2) from t1;

hex(c1)	hex(c2)

CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3

SET SQL_BIG_SELECTS=1;

select hex(c1), hex(c2) from t1;

hex(c1)	hex(c2)

CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3

drop table t1;

select "--- --6676--" as "";



--- --6676--

create table `t1` (

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

primary key (`pk`)

) engine=NDB default charset=latin1;

) engine=myisam default charset=latin1;

set @p=_latin1 'test';

update t1 set pk='test' where pk=@p;

drop table t1;

mysql-test/suite/rpl/r/rpl_row_charset.result

deleted100644 → 0
+0 −203
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;

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))engine=myisam;;

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

select "--- --muller--" as "";



--- --muller--

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("Mller","Muffler"));

set collation_connection=latin1_german2_ci;

insert into t1 (b) values(@@collation_connection);

insert into t1 (b) values(LEAST("Mller","Muffler"));



--- --master--

select * from t1 order by a;

a	b

1	latin1_german1_ci

2	Muffler

3	latin1_german2_ci

4	Mller



--- --slave--

select * from mysqltest2.t1 order by a;

a	b

1	latin1_german1_ci

2	Muffler

3	latin1_german2_ci

4	Mller

select "--- --INSERT--" as "";



--- --INSERT--

set @a= _cp850 'Mller' 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 <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	drop database if exists mysqltest2

master-bin.000001	#	Query	#	#	drop database if exists mysqltest3

master-bin.000001	#	Query	#	#	create database mysqltest2 character set latin2

master-bin.000001	#	Query	#	#	create database mysqltest3

master-bin.000001	#	Query	#	#	drop database mysqltest3

master-bin.000001	#	Query	#	#	create database mysqltest3

master-bin.000001	#	Query	#	#	use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100))engine=myisam

master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `mysqltest2`; truncate table t1

master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `mysqltest2`; truncate table t1

master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	drop database mysqltest2

master-bin.000001	#	Query	#	#	drop database mysqltest3

select "--- --global--" as "";



--- --global--

set global character_set_server=latin2;

set global character_set_server=latin1;

set global character_set_server=latin2;

set global character_set_server=latin1;

select "--- --oneshot--" as "";



--- --oneshot--

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'

select "--- --3943--" as "";



--- --3943--

use test;

CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255))ENGINE=myisam;;

SET CHARACTER_SET_CLIENT=koi8r,

CHARACTER_SET_CONNECTION=cp1251, 

CHARACTER_SET_RESULTS=koi8r;

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

SET SQL_BIG_SELECTS=1;

select hex(c1), hex(c2) from t1;

hex(c1)	hex(c2)

CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3

SET SQL_BIG_SELECTS=1;

select hex(c1), hex(c2) from t1;

hex(c1)	hex(c2)

CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3

drop table t1;

select "--- --6676--" as "";



--- --6676--

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;

mysql-test/suite/rpl/r/rpl_row_charset_innodb.result

deleted100644 → 0
+0 −227

File deleted.

Preview size limit exceeded, changes collapsed.