Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/extra/binlog_tests/binlog.test:
  Merge 5.0->5.1
mysql-test/r/binlog_stm_binlog.result:
  Merge 5.0->5.1

2 files changed, 8 insertions, 6 deletions

diff --git a/mysql-test/include/uses_vardir.inc b/mysql-test/include/uses_vardir.inc
index a5095c3e139..950de698a43 100644
--- a/mysql-test/include/uses_vardir.inc
+++ b/mysql-test/include/uses_vardir.inc
@@ -7,9 +7,8 @@
 # outside of it's vardir anyway
 #
 
-let $datadir=
-  query_get_value("SHOW VARIABLES LIKE 'datadir'", Value, 1);
-if (`select LOCATE("$MYSQLTEST_VARDIR", "$datadir") != 1`)
+
+if (`select LOCATE('$MYSQLTEST_VARDIR', REPLACE(@@datadir, '\\\\', '/')) != 1`)
 {
   skip Need mysqld in MYSQLTEST_VARDIR;
 }
diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
index f12f3fe90e8..11ff85818a7 100644
--- a/mysql-test/lib/mtr_cases.pl
+++ b/mysql-test/lib/mtr_cases.pl
@@ -607,9 +607,12 @@ sub collect_one_test_case($$$$$$$) {
     }
     else
     {
-      # Test does not need binlog, add --skip-binlog to
-      # the options used when starting it
-      push(@{$tinfo->{'master_opt'}}, "--skip-log-bin");
+      if ( $::mysql_version_id >= 50100 )
+      {
+	# Test does not need binlog, add --skip-binlog to
+	# the options used when starting it
+	push(@{$tinfo->{'master_opt'}}, "--skip-log-bin");
+      }
     }
 
   }