From 20a6f54651677eecd83fff6e7d78aa46311952b0 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@pilot.(none)>
Date: Thu, 7 Jun 2007 23:18:19 +0200
Subject: [PATCH 1/2] Bug#28718 Running backup testcase fails in mysql
 testsuite of MySQL-enterprise-5.0.40  - Fix test to work on OS where
 backslashes are forward

mysql-test/include/uses_vardir.inc:
  Make the test work on windows too
---
 mysql-test/include/uses_vardir.inc | 5 ++---
 1 file changed, 2 insertions(+), 3 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;
 }

From 44626a6de8d1d7d907ade133c7f9481376134621 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@pilot.(none)>
Date: Fri, 8 Jun 2007 07:16:36 +0200
Subject: [PATCH 2/2] Bug#28369 rpl test cases fail with binlog disabled

mysql-test/lib/mtr_cases.pl:
  Don't turn off binlog in versions prior to 5.0
mysql-test/r/binlog.result:
  Update result after adding "one more select"
mysql-test/t/binlog.test:
  Update result after adding "one more select"
---
 mysql-test/lib/mtr_cases.pl | 9 ++++++---
 mysql-test/r/binlog.result  | 4 ++--
 mysql-test/t/binlog.test    | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
index 6313733de4e..5e176dce109 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");
+      }
     }
 
   }
diff --git a/mysql-test/r/binlog.result b/mysql-test/r/binlog.result
index 25930c31735..4ed6c50c7f6 100644
--- a/mysql-test/r/binlog.result
+++ b/mysql-test/r/binlog.result
@@ -17,7 +17,7 @@ master-bin.000001	#	Query	1	#	use `test`; insert t1 values (5)
 master-bin.000001	#	Query	1	#	use `test`; COMMIT
 master-bin.000001	#	Query	1	#	use `test`; BEGIN
 master-bin.000001	#	Query	1	#	use `test`; insert t2 values (5)
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=12 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=13 */
 drop table t1,t2;
 reset master;
 create table t1 (n int) engine=innodb;
@@ -128,7 +128,7 @@ master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(4 + 4)
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(3 + 4)
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(2 + 4)
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(1 + 4)
-master-bin.000001	#	Xid	1	#	COMMIT /* xid=19 */
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=20 */
 master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002' from 98;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
diff --git a/mysql-test/t/binlog.test b/mysql-test/t/binlog.test
index 49369470d42..7c307cb3f94 100644
--- a/mysql-test/t/binlog.test
+++ b/mysql-test/t/binlog.test
@@ -20,7 +20,7 @@ begin;
 insert t2 values (5);
 commit;
 # first COMMIT must be Query_log_event, second - Xid_log_event
---replace_result "xid=21" "xid=12"
+--replace_result "xid=22" "xid=13"
 --replace_column 2 # 5 #
 show binlog events from 98;
 drop table t1,t2;
@@ -42,7 +42,7 @@ while ($1)
 --enable_query_log
 commit;
 drop table t1;
---replace_result "xid=32" "xid=19"
+--replace_result "xid=33" "xid=20"
 --replace_column 2 # 5 #
 show binlog events in 'master-bin.000001' from 98;
 --replace_column 2 # 5 #