Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 25 insertions, 0 deletions

diff --git a/mysql-test/suite/mtr2/combinations b/mysql-test/suite/mtr2/combinations
new file mode 100644
index 00000000..b26eab8c
--- /dev/null
+++ b/mysql-test/suite/mtr2/combinations
@@ -0,0 +1,5 @@
+[1st]
+lock-wait-timeout=5
+
+[2nd]
+lock-wait-timeout=3
diff --git a/mysql-test/suite/mtr2/overlay.inc b/mysql-test/suite/mtr2/overlay.inc
new file mode 100644
index 00000000..669b8315
--- /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
new file mode 100644
index 00000000..b0bd4a25
--- /dev/null
+++ b/mysql-test/suite/mtr2/single.result
@@ -0,0 +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
new file mode 100644
index 00000000..5acf716d
--- /dev/null
+++ b/mysql-test/suite/mtr2/single.test
@@ -0,0 +1,12 @@
+#
+# this suite is overlayed in heap and myisam.
+# mtr2-heap has my.cnf, mtr2-myisam has suite.opt
+# it means that all tests from the mtr2 suite will run
+# 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;
+