overlay support for mysql-test-run and mysqltest

mysql-test-run auto-disables all optional plugins.


mysql-test/include/default_client.cnf:
  no @OPT.plugindir anymore
mysql-test/include/default_mysqld.cnf:
  don't disable plugins manually - mtr can do it better
mysql-test/suite/innodb/t/innodb_bug47167.test:
  mtr now uses suite-dir as an include path
mysql-test/suite/innodb/t/innodb_file_format.test:
  mtr now uses suite-dir as an include path
mysql-test/t/partition_binlog.test:
  this test uses partitions
storage/example/mysql-test/mtr/t/source.result:
  update results. as mysqltest includes the correct overlayed include
storage/innobase/handler/ha_innodb.cc:
  the assert is wrong

22 files changed, 126 insertions, 0 deletions

diff --git a/mysql-test/suite/mtr/t/combs.combinations b/mysql-test/suite/mtr/t/combs.combinations
new file mode 100644
index 00000000000..9e49febf18f
--- /dev/null
+++ b/mysql-test/suite/mtr/t/combs.combinations
@@ -0,0 +1,5 @@
+[c1]
+allow-suspicious-udfs
+
+[c2]
+disable-local-infile
diff --git a/mysql-test/suite/mtr/t/combs.inc b/mysql-test/suite/mtr/t/combs.inc
new file mode 100644
index 00000000000..fb677ac9128
--- /dev/null
+++ b/mysql-test/suite/mtr/t/combs.inc
@@ -0,0 +1 @@
+select @@local_infile;
diff --git a/mysql-test/suite/mtr/t/inc.inc b/mysql-test/suite/mtr/t/inc.inc
new file mode 100644
index 00000000000..bf391f6e16f
--- /dev/null
+++ b/mysql-test/suite/mtr/t/inc.inc
@@ -0,0 +1 @@
+let $a=1;
diff --git a/mysql-test/suite/mtr/t/newcomb.result b/mysql-test/suite/mtr/t/newcomb.result
new file mode 100644
index 00000000000..8f7c125196a
--- /dev/null
+++ b/mysql-test/suite/mtr/t/newcomb.result
@@ -0,0 +1,3 @@
+select 1;
+1
+1
diff --git a/mysql-test/suite/mtr/t/newcomb.test b/mysql-test/suite/mtr/t/newcomb.test
new file mode 100644
index 00000000000..fa0fa48e56a
--- /dev/null
+++ b/mysql-test/suite/mtr/t/newcomb.test
@@ -0,0 +1,5 @@
+#
+# this tests how mtr handles a test that has no combinations in the
+# parent suite and one combination in the overlay.
+#
+select 1;
diff --git a/mysql-test/suite/mtr/t/proxy.inc b/mysql-test/suite/mtr/t/proxy.inc
new file mode 100644
index 00000000000..245f6a5a7fc
--- /dev/null
+++ b/mysql-test/suite/mtr/t/proxy.inc
@@ -0,0 +1,2 @@
+select "proxy";
+source combs.inc;
diff --git a/mysql-test/suite/mtr/t/self.result b/mysql-test/suite/mtr/t/self.result
new file mode 100644
index 00000000000..bd0d7c6ec53
--- /dev/null
+++ b/mysql-test/suite/mtr/t/self.result
@@ -0,0 +1,3 @@
+select "<>";
+<>
+<>
diff --git a/mysql-test/suite/mtr/t/self.test b/mysql-test/suite/mtr/t/self.test
new file mode 100644
index 00000000000..ad6e155cd94
--- /dev/null
+++ b/mysql-test/suite/mtr/t/self.test
@@ -0,0 +1,4 @@
+#
+# Test file that includes itself. See self.test in the example overlay
+#
+eval select "<$a>";
diff --git a/mysql-test/suite/mtr/t/simple,c2,s1.rdiff b/mysql-test/suite/mtr/t/simple,c2,s1.rdiff
new file mode 100644
index 00000000000..3023756aa8a
--- /dev/null
+++ b/mysql-test/suite/mtr/t/simple,c2,s1.rdiff
@@ -0,0 +1,11 @@
+--- suite/mtr/t/simple.result	2012-02-04 12:13:41.000000000 +0100
++++ suite/mtr/t/simple,infile,verbose.reject	2012-02-04 12:16:10.000000000 +0100
+@@ -3,7 +3,7 @@
+ proxy
+ select @@local_infile;
+ @@local_infile
+-1
++0
+ select @@old;
+ @@old
+ 0
diff --git a/mysql-test/suite/mtr/t/simple,s2,c2.rdiff b/mysql-test/suite/mtr/t/simple,s2,c2.rdiff
new file mode 100644
index 00000000000..a9b9b56ef1c
--- /dev/null
+++ b/mysql-test/suite/mtr/t/simple,s2,c2.rdiff
@@ -0,0 +1,11 @@
+--- suite/mtr/t/simple,old.result	2012-02-04 12:13:25.000000000 +0100
++++ suite/mtr/t/simple,old,infile.reject	2012-02-04 12:13:59.000000000 +0100
+@@ -3,7 +3,7 @@
+ proxy
+ select @@local_infile;
+ @@local_infile
+-1
++0
+ select @@old;
+ @@old
+ 1
diff --git a/mysql-test/suite/mtr/t/simple,s2.result b/mysql-test/suite/mtr/t/simple,s2.result
new file mode 100644
index 00000000000..0cd7a21e5f5
--- /dev/null
+++ b/mysql-test/suite/mtr/t/simple,s2.result
@@ -0,0 +1,9 @@
+select "proxy";
+proxy
+proxy
+select @@local_infile;
+@@local_infile
+1
+select @@old;
+@@old
+1
diff --git a/mysql-test/suite/mtr/t/simple.combinations b/mysql-test/suite/mtr/t/simple.combinations
new file mode 100644
index 00000000000..88cbb688451
--- /dev/null
+++ b/mysql-test/suite/mtr/t/simple.combinations
@@ -0,0 +1,5 @@
+[s1]
+verbose
+
+[s2]
+old
diff --git a/mysql-test/suite/mtr/t/simple.result b/mysql-test/suite/mtr/t/simple.result
new file mode 100644
index 00000000000..b4a0c1238fa
--- /dev/null
+++ b/mysql-test/suite/mtr/t/simple.result
@@ -0,0 +1,9 @@
+select "proxy";
+proxy
+proxy
+select @@local_infile;
+@@local_infile
+1
+select @@old;
+@@old
+0
diff --git a/mysql-test/suite/mtr/t/simple.test b/mysql-test/suite/mtr/t/simple.test
new file mode 100644
index 00000000000..f69a7dc7911
--- /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;
diff --git a/mysql-test/suite/mtr/t/single.result b/mysql-test/suite/mtr/t/single.result
new file mode 100644
index 00000000000..8f7c125196a
--- /dev/null
+++ b/mysql-test/suite/mtr/t/single.result
@@ -0,0 +1,3 @@
+select 1;
+1
+1
diff --git a/mysql-test/suite/mtr/t/single.test b/mysql-test/suite/mtr/t/single.test
new file mode 100644
index 00000000000..15262646ede
--- /dev/null
+++ b/mysql-test/suite/mtr/t/single.test
@@ -0,0 +1,5 @@
+#
+# the test is present in the mtr suite and is not affected by the example
+# overlay. It should run only once.
+#
+select 1;
diff --git a/mysql-test/suite/mtr/t/source.result b/mysql-test/suite/mtr/t/source.result
new file mode 100644
index 00000000000..8f7c125196a
--- /dev/null
+++ b/mysql-test/suite/mtr/t/source.result
@@ -0,0 +1,3 @@
+select 1;
+1
+1
diff --git a/mysql-test/suite/mtr/t/source.test b/mysql-test/suite/mtr/t/source.test
new file mode 100644
index 00000000000..1a2fc61e048
--- /dev/null
+++ b/mysql-test/suite/mtr/t/source.test
@@ -0,0 +1,8 @@
+#
+# The inc.inc file is overlayed in the example overlay. mtr should correctly
+# detect that this test needs to run for mtr-example. And mysqltest
+# needs to use the correct version of inc.inc depending on whether it
+# runs the parent suite or the overlay.
+#
+source inc.inc;
+eval select $a;
diff --git a/mysql-test/suite/mtr/t/test2.result b/mysql-test/suite/mtr/t/test2.result
new file mode 100644
index 00000000000..b1a55b32da2
--- /dev/null
+++ b/mysql-test/suite/mtr/t/test2.result
@@ -0,0 +1,4 @@
+select @@local_infile;
+select @@max_error_count;
+@@max_error_count
+64
diff --git a/mysql-test/suite/mtr/t/test2.test b/mysql-test/suite/mtr/t/test2.test
new file mode 100644
index 00000000000..5e310eaed2f
--- /dev/null
+++ b/mysql-test/suite/mtr/t/test2.test
@@ -0,0 +1,10 @@
+#
+# This test has two combinations in the mtr suite (from combs.combinations)
+# and one combination from mtr-example (overlayed combs.combinations).
+# But it also has test2.opt file in the overlay. Thus it will run
+# two times in the parent suite, and three times in the overlay.
+#
+--disable_result_log
+source combs.inc;
+--enable_result_log
+select @@max_error_count;
diff --git a/mysql-test/suite/mtr/t/testsh.result b/mysql-test/suite/mtr/t/testsh.result
new file mode 100644
index 00000000000..8f7c125196a
--- /dev/null
+++ b/mysql-test/suite/mtr/t/testsh.result
@@ -0,0 +1,3 @@
+select 1;
+1
+1
diff --git a/mysql-test/suite/mtr/t/testsh.test b/mysql-test/suite/mtr/t/testsh.test
new file mode 100644
index 00000000000..0bb818d2697
--- /dev/null
+++ b/mysql-test/suite/mtr/t/testsh.test
@@ -0,0 +1,6 @@
+#
+# There is testsh-master.sh in the example overlay. That makes the test
+# "affected by the overlay" and it will run twice: for the parent suite and
+# for the overlay.
+#
+select 1;