Fix after merge

mysql-test/extra/rpl_tests/rpl_charset.test:
  Fix merge error
mysql-test/lib/mtr_report.pm:
  Move the . out of [] to avoid log file parsing errors
mysql-test/mysql-test-run.pl:
  Correct spelling of option
sql/ha_ndbcluster_binlog.cc:
  Fix merge error(used "Use remote")

8 files changed, 18 insertions, 15 deletions

diff --git a/mysql-test/extra/rpl_tests/rpl_charset.test b/mysql-test/extra/rpl_tests/rpl_charset.test
index 4fb3c994c5a..8bcb60b0227 100644
--- a/mysql-test/extra/rpl_tests/rpl_charset.test
+++ b/mysql-test/extra/rpl_tests/rpl_charset.test
@@ -137,8 +137,6 @@ sync_slave_with_master;
 select hex(c1), hex(c2) from t1;
 
 connection master;
-let $MYSQLD_DATADIR= `select @@datadir`;
---exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000001 
 drop table t1;
 sync_slave_with_master;
 
diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm
index de5a1f05b34..0024c4a3f5b 100644
--- a/mysql-test/lib/mtr_report.pm
+++ b/mysql-test/lib/mtr_report.pm
@@ -75,7 +75,7 @@ sub mtr_report_test_skipped ($) {
   {
     if ( $tinfo->{skip_detected_by_test} )
     {
-      mtr_report("[ skip.]  $tinfo->{'comment'}");
+      mtr_report("[ skip ].  $tinfo->{'comment'}");
     }
     else
     {
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 4a7fbb41d5f..1bc74016bfe 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -302,7 +302,7 @@ sub command_line_setup {
              'start-from=s'             => \&collect_option,
              'big-test'                 => \$opt_big_test,
 	     'combination=s'            => \@opt_combinations,
-             'skip-combination'         => \&collect_option,
+             'skip-combinations'        => \&collect_option,
 
 	     'skip-im'                  => \&ignore_option,
 
diff --git a/mysql-test/suite/binlog/r/binlog_start_comment.result b/mysql-test/suite/binlog/r/binlog_start_comment.result
index 162968195f2..c5c906dfc4e 100644
--- a/mysql-test/suite/binlog/r/binlog_start_comment.result
+++ b/mysql-test/suite/binlog/r/binlog_start_comment.result
@@ -2,7 +2,7 @@ reset master;
 drop table if exists t1,t2;
 create table t1 (word varchar(20)) -- create table t1;
 create table t2 (word varchar(20)) -- create table t2;
-load data infile '../std_data_ln/words.dat' into table t1 -- load data to t1;
+load data infile '../../std_data/words.dat' into table t1 -- load data to t1;
 insert into t2 values ("Ada");
 flush logs;
 select * from t2;
diff --git a/mysql-test/suite/binlog/t/binlog_start_comment.test b/mysql-test/suite/binlog/t/binlog_start_comment.test
index a5817eb69b7..98f2ca05505 100644
--- a/mysql-test/suite/binlog/t/binlog_start_comment.test
+++ b/mysql-test/suite/binlog/t/binlog_start_comment.test
@@ -10,15 +10,16 @@ drop table if exists t1,t2;
 --enable_warnings
 create table t1 (word varchar(20)) -- create table t1;
 create table t2 (word varchar(20)) -- create table t2;
-load data infile '../std_data_ln/words.dat' into table t1 -- load data to t1;
+load data infile '../../std_data/words.dat' into table t1 -- load data to t1;
 insert into t2 values ("Ada");
 flush logs;
 select * from t2;
---exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
+let $MYSQLD_DATADIR= `select @@datadir`;
+--exec $MYSQL_BINLOG --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
 --exec $MYSQL --local-infile=1 < $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
 flush logs;
 select * from t2;
 
 # clean up
 drop table t1,t2;
-#--system rm $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog
+remove_file $MYSQLTEST_VARDIR/tmp/binlog_start_comment.binlog;
diff --git a/mysql-test/t/drop.test b/mysql-test/t/drop.test
index a79044436eb..2bd37f9ad0d 100644
--- a/mysql-test/t/drop.test
+++ b/mysql-test/t/drop.test
@@ -131,7 +131,8 @@ create table mysql_test.t1(f1 int);
 create table mysql_test.`#sql-347f_7` (f1 int);
 create table mysql_test.`#sql-347f_8` (f1 int);
 drop table mysql_test.`#sql-347f_8`;
-copy_file $MYSQLTEST_VARDIR/master-data/mysql_test/t1.frm $MYSQLTEST_VARDIR/master-data/mysql_test/#sql-347f_6.frm;
+let $MYSQLD_DATADIR= `select @@datadir`;
+copy_file $MYSQLD_DATADIR/mysql_test/t1.frm $MYSQLD_DATADIR/mysql_test/#sql-347f_6.frm;
 drop database mysql_test;
 
 --echo End of 5.1 tests
diff --git a/mysql-test/t/myisampack.test b/mysql-test/t/myisampack.test
index 6598af6318a..89bd8b02bd1 100644
--- a/mysql-test/t/myisampack.test
+++ b/mysql-test/t/myisampack.test
@@ -26,8 +26,9 @@ INSERT INTO t1 VALUES
 (2.22402118719591e-05,2.37546284320705e-05,2.58463051055541e-05,1.83391609130854e-05,1.6300720519646e-05,1.74559091886791e-05,1.63733785575587e-05,2.26616253279828e-05,1.79541237435621e-05,45),
 (3.01092775359837e-05,3.23865212934412e-05,4.09444584045994e-05,0,2.15470966302776e-05,2.39082636344032e-05,2.28296706429177e-05,2.9007671511595e-05,2.44201138973326e-05,46);
 FLUSH TABLES;
---exec $MYISAMPACK -s $MYSQLTEST_VARDIR/master-data/test/t1
---exec $MYISAMCHK -srq $MYSQLTEST_VARDIR/master-data/test/t1
---exec $MYISAMCHK -s --unpack $MYSQLTEST_VARDIR/master-data/test/t1
+let $MYSQLD_DATADIR= `select @@datadir`;
+--exec $MYISAMPACK -s $MYSQLD_DATADIR/test/t1
+--exec $MYISAMCHK -srq $MYSQLD_DATADIR/test/t1
+--exec $MYISAMCHK -s --unpack $MYSQLD_DATADIR/test/t1
 CHECK TABLE t1 EXTENDED;
 DROP TABLE t1;
diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test
index ba13a315cb8..2d96d00772c 100644
--- a/mysql-test/t/mysqlcheck.test
+++ b/mysql-test/t/mysqlcheck.test
@@ -55,9 +55,10 @@ create table t_bug25347 (a int);
 create view v_bug25347 as select * from t_bug25347;
 insert into t_bug25347 values (1),(2),(3);
 flush tables;
+let $MYSQLD_DATADIR= `select @@datadir`;
 --echo removing and creating
---remove_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI
---write_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI
+--remove_file $MYSQLD_DATADIR/d_bug25347/t_bug25347.MYI
+--write_file $MYSQLD_DATADIR/d_bug25347/t_bug25347.MYI
 EOF
 --exec $MYSQL_CHECK --repair --databases d_bug25347
 --error 130
@@ -79,7 +80,8 @@ use test;
 create table t1(a int);
 create view v1 as select * from t1;
 show tables;
---copy_file $MYSQLTEST_VARDIR/master-data/test/v1.frm $MYSQLTEST_VARDIR/master-data/test/v-1.frm
+let $MYSQLD_DATADIR= `select @@datadir`;
+--copy_file $MYSQLD_DATADIR/test/v1.frm $MYSQLD_DATADIR/test/v-1.frm
 show tables;
 --exec $MYSQL_CHECK --check-upgrade --fix-table-names --databases test
 show tables;