summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorElena Stepanova <elenst@gmail.com>2013-11-10 14:37:32 +0400
committerElena Stepanova <elenst@gmail.com>2013-11-10 14:37:32 +0400
commit700397a8e2ac0435ac8142040cd746bce6dc8eb7 (patch)
treec7e7dac9f08d4fbc9bdf91cb3febd858a917063e /mysql-test/suite
parentef43b71fd20ba5cd8b85771dda1bd18f06625211 (diff)
downloadmariadb-git-700397a8e2ac0435ac8142040cd746bce6dc8eb7.tar.gz
Fix for overlayed include files on Windows and a test case
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/mtr2/overlay.inc2
-rw-r--r--mysql-test/suite/mtr2/single.result3
-rw-r--r--mysql-test/suite/mtr2/single.test4
3 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/suite/mtr2/overlay.inc b/mysql-test/suite/mtr2/overlay.inc
new file mode 100644
index 00000000000..669b8315fcb
--- /dev/null
+++ b/mysql-test/suite/mtr2/overlay.inc
@@ -0,0 +1,2 @@
+select 2;
+
diff --git a/mysql-test/suite/mtr2/single.result b/mysql-test/suite/mtr2/single.result
index 8f7c125196a..b0bd4a256d7 100644
--- a/mysql-test/suite/mtr2/single.result
+++ b/mysql-test/suite/mtr2/single.result
@@ -1,3 +1,6 @@
select 1;
1
1
+select 2;
+2
+2
diff --git a/mysql-test/suite/mtr2/single.test b/mysql-test/suite/mtr2/single.test
index 122e1bb00e4..5acf716d6cb 100644
--- a/mysql-test/suite/mtr2/single.test
+++ b/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;
+