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

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

1 files changed, 15 insertions, 0 deletions

diff --git a/mysql-test/suite/mtr/t/simple.test b/mysql-test/suite/mtr/t/simple.test
new file mode 100644
index 00000000..f69a7dc7
--- /dev/null
+++ b/mysql-test/suite/mtr/t/simple.test
@@ -0,0 +1,15 @@
+#
+# This tests the following:
+#   simple.test has two combinations (in simple.combinations).
+#   it includes combs.inc (indirectly, via proxy.inc) with two more combinations
+#   thus it should run 4 times
+#
+#   combs.combinations is overlayed in the example overlay, adding one more
+#   combination. Thus simple.test must run two more times in the mtr-example.
+#
+#   Note that neither simple.test nor proxy.inc are touched by the overlay,
+#   mtr needs to propagate "affected by the overlay" flag up the
+#   inclusion chain.
+#
+source proxy.inc;
+select @@old;