--- ./mysql-test/include/rpl_stmt_seq.inc.ORIG	Fri Sep 14 21:39:47 2007
+++ ./mysql-test/include/rpl_stmt_seq.inc	Mon Sep 24 10:09:56 2007
@@ -80,7 +80,7 @@
 SELECT MAX(f1) FROM t1;
 if ($show_binlog)
 {
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION 5.1.22-rc-log VERSION
 --replace_column 2 # 5 #
 eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';
 }
@@ -93,7 +93,7 @@
 SELECT MAX(f1) FROM t1;
 if ($show_binlog)
 {
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION 5.1.22-rc-log VERSION
 --replace_column 2 # 5 #
 eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';
 }
@@ -111,7 +111,7 @@
 SELECT MAX(f1) FROM t1;
 if ($show_binlog)
 {
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION 5.1.22-rc-log VERSION
 --replace_column 2 # 5 #
 eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';
 }
@@ -124,7 +124,7 @@
 SELECT MAX(f1) FROM t1;
 if ($show_binlog)
 {
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION 5.1.22-rc-log VERSION
 --replace_column 2 # 5 #
 eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';
 }
@@ -150,7 +150,7 @@
 --enable_query_log
 if ($show_binlog)
 {
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION 5.1.22-rc-log VERSION
 --replace_column 2 # 5 #
 eval SHOW BINLOG EVENTS IN 'master-bin.$_log_num_s';
 }
@@ -171,7 +171,7 @@
 --enable_query_log
 if ($show_binlog)
 {
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION 5.1.22-rc-log VERSION
 --replace_column 2 # 5 #
 eval SHOW BINLOG EVENTS IN 'slave-bin.$_log_num_s';
 }
--- ./mysql-test/extra/rpl_tests/rpl_log.test.ORIG	Fri Sep 14 21:39:47 2007
+++ ./mysql-test/extra/rpl_tests/rpl_log.test	Mon Sep 24 10:11:44 2007
@@ -35,7 +35,7 @@
 eval create table t1 (word char(20) not null)ENGINE=$engine_type;
 load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines;
 select count(*) from t1;
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION 5.1.22-rc-log VERSION
 --replace_column 2 # 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
 show binlog events;
@@ -94,7 +94,7 @@
 eval create table t2 (n int)ENGINE=$engine_type;
 insert into t2 values (1);
 source include/show_binlog_events.inc;
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION 5.1.22-rc-log VERSION
 --replace_column 2 # 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
 show binlog events in 'master-bin.000002';
@@ -104,11 +104,11 @@
 start slave;
 sync_with_master;
 show binary logs;
---replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
+--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION 5.1.22-rc-log VERSION
 --replace_column 2 # 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
 show binlog events in 'slave-bin.000001' from 4;
---replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
+--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION 5.1.22-rc-log VERSION
 --replace_column 2 # 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
 show binlog events in 'slave-bin.000002' from 4;
--- ./mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test.ORIG	Fri Sep 14 20:54:49 2007
+++ ./mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test	Mon Sep 24 10:06:31 2007
@@ -48,7 +48,7 @@
 INSERT INTO t1 VALUES (1),(2);
 DELETE FROM t1 WHERE a = 0;
 UPDATE t1 SET a=99 WHERE a = 0;
---replace_result $SERVER_VERSION SERVER_VERSION
+--replace_result $SERVER_VERSION SERVER_VERSION 5.1.22-rc-log SERVER_VERSION
 --replace_regex /table_id: [0-9]+/table_id: #/
 SHOW BINLOG EVENTS;
 
--- ./mysql-test/suite/rpl/t/rpl_row_drop.test.ORIG	Fri Sep 14 20:55:26 2007
+++ ./mysql-test/suite/rpl/t/rpl_row_drop.test	Mon Sep 24 10:05:52 2007
@@ -31,7 +31,7 @@
 # Should drop the non-temporary table t1 and the temporary table t2
 DROP TABLE t1,t2;
 let $VERSION=`select version()`;
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION 5.1.22-rc-log VERSION
 --replace_regex /table_id: [0-9]+/table_id: #/
 SHOW BINLOG EVENTS;
 SHOW TABLES;
--- ./mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test.ORIG	Fri Sep 14 20:57:10 2007
+++ ./mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test	Mon Sep 24 10:07:10 2007
@@ -14,7 +14,7 @@
 INSERT INTO t1 VALUES (1,1), (2,2);
 INSERT INTO t1 VALUES (3,UUID()), (4,UUID());
 let $VERSION=`select version()`;
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION 5.1.22-rc-log VERSION
 --replace_column 2 # 5 #
 --replace_regex /table_id: [0-9]+/table_id: #/
 SHOW BINLOG EVENTS;
@@ -23,7 +23,7 @@
 --replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 1 # 8 # 9 # 23 # 33 # 34 # 35 #
 --query_vertical SHOW SLAVE STATUS
---replace_result $VERSION VERSION
+--replace_result $VERSION VERSION 5.1.22-rc-log VERSION
 --replace_column 2 # 5 #
 --replace_regex /table_id: [0-9]+/table_id: #/
 SHOW BINLOG EVENTS;
--- ./mysql-test/suite/rpl/t/disabled.def.ORIG	Fri Sep 14 20:56:23 2007
+++ ./mysql-test/suite/rpl/t/disabled.def	Mon Sep 24 10:29:54 2007
@@ -17,3 +17,6 @@
 rpl_auto_increment_11932   : Bug#29809 2007-07-16 ingo Slave SQL errors in warnings file
 rpl_stm_extraColmaster_ndb : WL#3915 : Statement-based replication not supported in ndb. Enable test when supported.
 rpl_row_extraColmaster_ndb : BUG#29549 : Replication of BLOBs fail for NDB
+rpl_innodb_bug28430        : kent
+rpl_innodb_bug30888        : kent
+rpl_colSize                : kent BUG#22086
--- ./mysql-test/mysql-test-run.pl.ORIG	Fri Sep 14 20:55:06 2007
+++ ./mysql-test/mysql-test-run.pl	Mon Sep 24 11:55:40 2007
@@ -113,6 +113,8 @@
 our $path_client_bindir;
 our $path_share;
 our $path_language;
+our $path_language_master;
+our $path_language_slave;
 our $path_timefile;
 our $path_snapshot;
 our $path_mysqltest_log;
@@ -1007,6 +1009,13 @@
   $exe_master_mysqld= $exe_master_mysqld || $exe_mysqld;
   $exe_slave_mysqld=  $exe_slave_mysqld  || $exe_mysqld;
 
+  # kent we want error files from our exe directiory
+  $path_language_master= dirname(dirname($exe_master_mysqld)) . "/share/mysql/english";
+  $path_language_slave=  dirname(dirname($exe_slave_mysqld))  . "/share/mysql/english";
+
+  print "XXX $path_language_master\n";
+  print "XXX $path_language_slave\n";
+
   # --------------------------------------------------------------------------
   # Check valgrind arguments
   # --------------------------------------------------------------------------
@@ -1738,7 +1747,7 @@
   if ( $glob_use_embedded_server )
   {
     mtr_add_arg($args,
-      " -A --language=$path_language");
+      " -A --language=$path_language_slave");
     mtr_add_arg($args,
       " -A --datadir=$slave->[0]->{'path_myddir'}");
     mtr_add_arg($args,
@@ -3811,7 +3820,7 @@
   if ( $mysql_version_id >= 50036)
   {
     # By default, prevent the started mysqld to access files outside of vardir
-    mtr_add_arg($args, "%s--secure-file-priv=%s", $prefix, $opt_vardir);
+    mtr_add_arg($args, "%s--loose-secure-file-priv=%s", $prefix, $opt_vardir);
   }
 
   if ( $mysql_version_id >= 50000 )
@@ -3820,7 +3829,6 @@
   }
 
   mtr_add_arg($args, "%s--default-character-set=latin1", $prefix);
-  mtr_add_arg($args, "%s--language=%s", $prefix, $path_language);
   mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix);
 
   if ( $opt_valgrind_mysqld )
@@ -3861,6 +3869,8 @@
   my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);
   if ( $mysqld->{'type'} eq 'master' )
   {
+    mtr_add_arg($args, "%s--language=%s", $prefix, $path_language_master);
+
     if (! ($opt_skip_master_binlog || $skip_binlog) )
     {
       mtr_add_arg($args, "%s--log-bin=%s/log/master-bin%s", $prefix,
@@ -3902,6 +3912,7 @@
     mtr_error("unknown mysqld type")
       unless $mysqld->{'type'} eq 'slave';
 
+    mtr_add_arg($args, "%s--language=%s", $prefix, $path_language_slave);
     mtr_add_arg($args, "%s--init-rpl-role=slave", $prefix);
     if (! ( $opt_skip_slave_binlog || $skip_binlog ))
     {