Fix for overlayed include files on Windows and a test case

client/mysqltest.cc

@@ -2992,6 +2992,9 @@ void open_file(const char *name)
   char buff[FN_REFLEN];
   size_t length;
   const char *curname= cur_file->file_name;
+#ifdef __WIN__
+  fix_win_paths(curname, sizeof(curname));
+#endif
   DBUG_ENTER("open_file");
   DBUG_PRINT("enter", ("name: %s", name));
 

mysql-test/suite/mtr2/overlay.inc

+select 2;
+

mysql-test/suite/mtr2/single.result

 select 1;
 1
 1
+select 2;
+2
+2

mysql-test/suite/mtr2/single.test

@@ -5,4 +5,8 @@
 # three times - once for the parent suite, and once for each overlay.
 # even if the test files are not overlayed.
 #
+# overlay.inc is overridden in mtr2-myisam, and there is an rdiff file.
+#
 select 1;
+source overlay.inc;
+

storage/myisam/mysql-test/mtr2/overlay.inc

+select 3;
+

storage/myisam/mysql-test/mtr2/single.rdiff

+--- suite/mtr2/single.result	2013-11-10 03:58:37.000000000 +0400
++++ suite/mtr2/single.reject	2013-11-10 03:59:08.000000000 +0400
+@@ -1,6 +1,6 @@
+ select 1;
+ 1
+ 1
+-select 2;
+-2
+-2
++select 3;
++3
++3