The test rpl_row_charset and it dependent rpl_ndb_charset is

irrelevant to execute since the charset information does not
affect replication for row-based replication. The row-based
versions of the tests were removed, and the statement-based
version of the test was made executable by all three modes.

This involves removing any lines that causes the test to be
dependent on the contents of the binary log, and instead we
just check that the replication works as it should.

13 files changed, 12 insertions, 1019 deletions

diff --git a/mysql-test/extra/rpl_tests/rpl_stm_charset.test b/mysql-test/extra/rpl_tests/rpl_charset.test
index 629ccdf69f7..8bcb60b0227 100644
--- a/mysql-test/extra/rpl_tests/rpl_stm_charset.test
+++ b/mysql-test/extra/rpl_tests/rpl_charset.test
@@ -1,9 +1,6 @@
 # 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üller","Muffler"));
 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;
 
diff --git a/mysql-test/extra/rpl_tests/rpl_row_charset.test b/mysql-test/extra/rpl_tests/rpl_row_charset.test
deleted file mode 100644
index c1eccff9bd5..00000000000
--- a/mysql-test/extra/rpl_tests/rpl_row_charset.test
+++ /dev/null
@@ -1,179 +0,0 @@
-# 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("Müller","Muffler"));
-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
-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 '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
-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;
diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result b/mysql-test/suite/rpl/r/rpl_charset.result
index 8b1f3093332..ae5cf3b0fd1 100644
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result
+++ b/mysql-test/suite/rpl/r/rpl_charset.result
@@ -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üller","Muffler"));
 set collation_connection=latin1_german2_ci;
 insert into t1 (b) values(@@collation_connection);
 insert into t1 (b) values(LEAST("Müller","Muffler"));
-
 --- --master--
 select * from t1 order by a;
 a	b
@@ -83,7 +77,6 @@ a	b
 2	Muffler
 3	latin1_german2_ci
 4	Müller
-
 --- --slave--
 select * from mysqltest2.t1 order by a;
 a	b
@@ -91,65 +84,23 @@ a	b
 2	Muffler
 3	latin1_german2_ci
 4	Müller
-select "--- --INSERT--" as "";
-
---- --INSERT--
 set @a= _cp850 'Müller' 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;
diff --git a/mysql-test/suite/rpl/r/rpl_row_charset.result b/mysql-test/suite/rpl/r/rpl_row_charset.result
deleted file mode 100644
index caaa9d8332b..00000000000
--- a/mysql-test/suite/rpl/r/rpl_row_charset.result
+++ /dev/null
@@ -1,203 +0,0 @@
-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("Müller","Muffler"));
-set collation_connection=latin1_german2_ci;
-insert into t1 (b) values(@@collation_connection);
-insert into t1 (b) values(LEAST("Müller","Muffler"));
-
---- --master--
-select * from t1 order by a;
-a	b
-1	latin1_german1_ci
-2	Muffler
-3	latin1_german2_ci
-4	Müller
-
---- --slave--
-select * from mysqltest2.t1 order by a;
-a	b
-1	latin1_german1_ci
-2	Muffler
-3	latin1_german2_ci
-4	Müller
-select "--- --INSERT--" as "";
-
---- --INSERT--
-set @a= _cp850 'Müller' 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;
diff --git a/mysql-test/suite/rpl/r/rpl_row_charset_innodb.result b/mysql-test/suite/rpl/r/rpl_row_charset_innodb.result
deleted file mode 100644
index 4edc224135e..00000000000
--- a/mysql-test/suite/rpl/r/rpl_row_charset_innodb.result
+++ /dev/null
@@ -1,227 +0,0 @@
-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=innodb;;
-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("Müller","Muffler"));
-set collation_connection=latin1_german2_ci;
-insert into t1 (b) values(@@collation_connection);
-insert into t1 (b) values(LEAST("Müller","Muffler"));
-
---- --master--
-select * from t1 order by a;
-a	b
-1	latin1_german1_ci
-2	Muffler
-3	latin1_german2_ci
-4	Müller
-
---- --slave--
-select * from mysqltest2.t1 order by a;
-a	b
-1	latin1_german1_ci
-2	Muffler
-3	latin1_german2_ci
-4	Müller
-select "--- --INSERT--" as "";
-
---- --INSERT--
-set @a= _cp850 'Müller' 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=innodb
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Query	#	#	use `mysqltest2`; truncate table t1
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Query	#	#	use `mysqltest2`; truncate table t1
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `mysqltest2`; BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest2.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-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=innodb;;
-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=innodb default charset=latin1;
-set @p=_latin1 'test';
-update t1 set pk='test' where pk=@p;
-drop table t1;
diff --git a/mysql-test/suite/rpl/r/rpl_stm_charset.result b/mysql-test/suite/rpl/r/rpl_stm_charset.result
deleted file mode 100644
index 1f21f226be8..00000000000
--- a/mysql-test/suite/rpl/r/rpl_stm_charset.result
+++ /dev/null
@@ -1,293 +0,0 @@
-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));
-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
-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("Müller","Muffler"));
-set collation_connection=latin1_german2_ci;
-insert into t1 (b) values(@@collation_connection);
-insert into t1 (b) values(LEAST("Müller","Muffler"));
-
---- --master--
-select * from t1 order by a;
-a	b
-1	latin1_german1_ci
-2	Muffler
-3	latin1_german2_ci
-4	Müller
-
---- --slave--
-select * from mysqltest2.t1 order by a;
-a	b
-1	latin1_german1_ci
-2	Muffler
-3	latin1_german2_ci
-4	Müller
-set @a= _cp850 'Müller' 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))
-master-bin.000001	#	Intvar	#	#	INSERT_ID=1
-master-bin.000001	#	Query	#	#	use `mysqltest2`; insert into t1 (b) values(@@character_set_server)
-master-bin.000001	#	Intvar	#	#	INSERT_ID=2
-master-bin.000001	#	Query	#	#	use `mysqltest2`; insert into t1 (b) values(@@collation_server)
-master-bin.000001	#	Intvar	#	#	INSERT_ID=3
-master-bin.000001	#	Query	#	#	use `mysqltest2`; insert into t1 (b) values(@@character_set_client)
-master-bin.000001	#	Intvar	#	#	INSERT_ID=4
-master-bin.000001	#	Query	#	#	use `mysqltest2`; insert into t1 (b) values(@@character_set_connection)
-master-bin.000001	#	Intvar	#	#	INSERT_ID=5
-master-bin.000001	#	Query	#	#	use `mysqltest2`; insert into t1 (b) values(@@collation_connection)
-master-bin.000001	#	Query	#	#	use `mysqltest2`; truncate table t1
-master-bin.000001	#	Intvar	#	#	INSERT_ID=1
-master-bin.000001	#	Query	#	#	use `mysqltest2`; insert into t1 (b) values(@@collation_connection)
-master-bin.000001	#	Intvar	#	#	INSERT_ID=2
-master-bin.000001	#	Query	#	#	use `mysqltest2`; insert into t1 (b) values(LEAST("Müller","Muffler"))
-master-bin.000001	#	Intvar	#	#	INSERT_ID=3
-master-bin.000001	#	Query	#	#	use `mysqltest2`; insert into t1 (b) values(@@collation_connection)
-master-bin.000001	#	Intvar	#	#	INSERT_ID=4
-master-bin.000001	#	Query	#	#	use `mysqltest2`; insert into t1 (b) values(LEAST("Müller","Muffler"))
-master-bin.000001	#	Query	#	#	use `mysqltest2`; truncate table t1
-master-bin.000001	#	Intvar	#	#	INSERT_ID=1
-master-bin.000001	#	User var	#	#	@`a`=_cp850 0x4DFC6C6C6572 COLLATE cp850_general_ci
-master-bin.000001	#	Query	#	#	use `mysqltest2`; insert into t1 (b) values(collation(@a))
-master-bin.000001	#	Query	#	#	drop database mysqltest2
-master-bin.000001	#	Query	#	#	drop database mysqltest3
-set global character_set_server=latin2;
-set global character_set_server=latin1;
-set global character_set_server=latin2;
-set global character_set_server=latin1;
-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'
-use test;
-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 ('îÕ, ÚÁ ÒÙÂÁÌËÕ','îÕ, ÚÁ ÒÙÂÁÌËÕ');
-select hex(c1), hex(c2) from t1;
-hex(c1)	hex(c2)
-CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
-select hex(c1), hex(c2) from t1;
-hex(c1)	hex(c2)
-CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
-flush logs;
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
-/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
-DELIMITER /*!*/;
-ROLLBACK/*!*/;
-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/*!*/;
-drop database if exists mysqltest2
-/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-drop database if exists mysqltest3
-/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-create database mysqltest2 character set latin2
-/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=30/*!*/;
-create database mysqltest3
-/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=64/*!*/;
-drop database mysqltest3
-/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-create database mysqltest3
-/*!*/;
-use mysqltest2/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-create table t1 (a int auto_increment primary key, b varchar(100))
-/*!*/;
-SET INSERT_ID=1/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-/*!\C cp850 *//*!*/;
-SET @@session.character_set_client=4,@@session.collation_connection=27,@@session.collation_server=64/*!*/;
-insert into t1 (b) values(@@character_set_server)
-/*!*/;
-SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-insert into t1 (b) values(@@collation_server)
-/*!*/;
-SET INSERT_ID=3/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-insert into t1 (b) values(@@character_set_client)
-/*!*/;
-SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-insert into t1 (b) values(@@character_set_connection)
-/*!*/;
-SET INSERT_ID=5/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-insert into t1 (b) values(@@collation_connection)
-/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=5,@@session.collation_server=64/*!*/;
-truncate table t1
-/*!*/;
-SET INSERT_ID=1/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-insert into t1 (b) values(@@collation_connection)
-/*!*/;
-SET INSERT_ID=2/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-insert into t1 (b) values(LEAST("Müller","Muffler"))
-/*!*/;
-SET INSERT_ID=3/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=31,@@session.collation_server=64/*!*/;
-insert into t1 (b) values(@@collation_connection)
-/*!*/;
-SET INSERT_ID=4/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-insert into t1 (b) values(LEAST("Müller","Muffler"))
-/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-truncate table t1
-/*!*/;
-SET INSERT_ID=1/*!*/;
-SET @`a`:=_cp850 0x4DFC6C6C6572 COLLATE `cp850_general_ci`/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-insert into t1 (b) values(collation(@a))
-/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-drop database mysqltest2
-/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-drop database mysqltest3
-/*!*/;
-use test/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-/*!\C latin1 *//*!*/;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=30/*!*/;
-CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255))
-/*!*/;
-SET TIMESTAMP=1000000000/*!*/;
-/*!\C koi8r *//*!*/;
-SET @@session.character_set_client=7,@@session.collation_connection=51,@@session.collation_server=30/*!*/;
-INSERT INTO t1 (c1, c2) VALUES ('îÕ, ÚÁ ÒÙÂÁÌËÕ','îÕ, ÚÁ ÒÙÂÁÌËÕ')
-/*!*/;
-DELIMITER ;
-# End of log file
-ROLLBACK /* added by mysqlbinlog */;
-/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
-drop table t1;
-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;
diff --git a/mysql-test/suite/rpl/t/rpl_charset.test b/mysql-test/suite/rpl/t/rpl_charset.test
new file mode 100644
index 00000000000..ed0d835f22d
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_charset.test
@@ -0,0 +1,3 @@
+let $engine_type=myisam;
+source extra/rpl_tests/rpl_charset.test;
+
diff --git a/mysql-test/suite/rpl/t/rpl_row_charset.test b/mysql-test/suite/rpl/t/rpl_row_charset.test
deleted file mode 100644
index c83ccc586ba..00000000000
--- a/mysql-test/suite/rpl/t/rpl_row_charset.test
+++ /dev/null
@@ -1,9 +0,0 @@
-########################################################
-# By JBM 2005-02-15 Wrapped to allow reuse of test code#
-# Added to skip if ndb is default                      #
-########################################################
--- source include/not_ndb_default.inc
--- source include/have_binlog_format_row.inc
--- source include/master-slave.inc
-let $engine_type=myisam;
--- source extra/rpl_tests/rpl_row_charset.test
diff --git a/mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt b/mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt
deleted file mode 100644
index 627becdbfb5..00000000000
--- a/mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt
+++ /dev/null
@@ -1 +0,0 @@
---innodb
diff --git a/mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt b/mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt
deleted file mode 100644
index 627becdbfb5..00000000000
--- a/mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt
+++ /dev/null
@@ -1 +0,0 @@
---innodb
diff --git a/mysql-test/suite/rpl/t/rpl_row_charset_innodb.test b/mysql-test/suite/rpl/t/rpl_row_charset_innodb.test
deleted file mode 100644
index 2d48af65581..00000000000
--- a/mysql-test/suite/rpl/t/rpl_row_charset_innodb.test
+++ /dev/null
@@ -1,10 +0,0 @@
-########################################################
-# By JBM 2005-02-15 Wrapped to allow reuse of test code#
-# Added to skip if ndb is default                      #
-########################################################
--- source include/not_ndb_default.inc
--- source include/have_binlog_format_row.inc
--- source include/have_innodb.inc
--- source include/master-slave.inc
-let $engine_type=innodb;
--- source extra/rpl_tests/rpl_row_charset.test
diff --git a/mysql-test/suite/rpl/t/rpl_stm_charset.test b/mysql-test/suite/rpl/t/rpl_stm_charset.test
deleted file mode 100644
index b103a47d78c..00000000000
--- a/mysql-test/suite/rpl/t/rpl_stm_charset.test
+++ /dev/null
@@ -1,2 +0,0 @@
-let $engine_type=myisam;
--- source extra/rpl_tests/rpl_stm_charset.test
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test
deleted file mode 100644
index f14229a52f9..00000000000
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test
+++ /dev/null
@@ -1,8 +0,0 @@
-########################################################
-# By JBM 2005-02-15 Wrapped to allow reuse of test code#
-########################################################
--- source include/have_ndb.inc
--- source include/have_binlog_format_mixed_or_row.inc
--- source include/ndb_master-slave.inc
-let $engine_type=NDB;
--- source extra/rpl_tests/rpl_row_charset.test