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

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

12 files changed, 48 insertions, 0 deletions

diff --git a/storage/example/mysql-test/mtr/t/combs.combinations b/storage/example/mysql-test/mtr/t/combs.combinations
new file mode 100644
index 00000000..518a0262
--- /dev/null
+++ b/storage/example/mysql-test/mtr/t/combs.combinations
@@ -0,0 +1,2 @@
+[c3o]
+table-cache=32
diff --git a/storage/example/mysql-test/mtr/t/inc.inc b/storage/example/mysql-test/mtr/t/inc.inc
new file mode 100644
index 00000000..8bca2f83
--- /dev/null
+++ b/storage/example/mysql-test/mtr/t/inc.inc
@@ -0,0 +1 @@
+let $a=2;
diff --git a/storage/example/mysql-test/mtr/t/newcomb.combinations b/storage/example/mysql-test/mtr/t/newcomb.combinations
new file mode 100644
index 00000000..baeaaf83
--- /dev/null
+++ b/storage/example/mysql-test/mtr/t/newcomb.combinations
@@ -0,0 +1,2 @@
+[new]
+--ansi
diff --git a/storage/example/mysql-test/mtr/t/over.result b/storage/example/mysql-test/mtr/t/over.result
new file mode 100644
index 00000000..20f11088
--- /dev/null
+++ b/storage/example/mysql-test/mtr/t/over.result
@@ -0,0 +1,4 @@
+select @@local_infile;
+select 1;
+1
+1
diff --git a/storage/example/mysql-test/mtr/t/over.test b/storage/example/mysql-test/mtr/t/over.test
new file mode 100644
index 00000000..15c57ec4
--- /dev/null
+++ b/storage/example/mysql-test/mtr/t/over.test
@@ -0,0 +1,8 @@
+#
+# This test exists only in the overlay. It will run only for the overlay
+# and not for the parent suite.
+#
+--disable_result_log
+source suite/mtr/t/combs.inc;
+--enable_result_log
+select 1;
diff --git a/storage/example/mysql-test/mtr/t/self.result b/storage/example/mysql-test/mtr/t/self.result
new file mode 100644
index 00000000..b907150d
--- /dev/null
+++ b/storage/example/mysql-test/mtr/t/self.result
@@ -0,0 +1,6 @@
+select "<1>";
+<1>
+<1>
+select "<2>";
+<2>
+<2>
diff --git a/storage/example/mysql-test/mtr/t/self.test b/storage/example/mysql-test/mtr/t/self.test
new file mode 100644
index 00000000..6afa109d
--- /dev/null
+++ b/storage/example/mysql-test/mtr/t/self.test
@@ -0,0 +1,8 @@
+#
+# A test that includes itself. But really it includes the
+# self.test from the parent suite, not itself.
+#
+let $a=1;
+source self.test;
+let $a=2;
+source self.test;
diff --git a/storage/example/mysql-test/mtr/t/source.result b/storage/example/mysql-test/mtr/t/source.result
new file mode 100644
index 00000000..07fac9ed
--- /dev/null
+++ b/storage/example/mysql-test/mtr/t/source.result
@@ -0,0 +1,3 @@
+select 2;
+2
+2
diff --git a/storage/example/mysql-test/mtr/t/test2,c2.result b/storage/example/mysql-test/mtr/t/test2,c2.result
new file mode 100644
index 00000000..ff5fb337
--- /dev/null
+++ b/storage/example/mysql-test/mtr/t/test2,c2.result
@@ -0,0 +1,4 @@
+select @@local_infile;
+select @@max_error_count;
+@@max_error_count
+32
diff --git a/storage/example/mysql-test/mtr/t/test2.opt b/storage/example/mysql-test/mtr/t/test2.opt
new file mode 100644
index 00000000..e0a2b842
--- /dev/null
+++ b/storage/example/mysql-test/mtr/t/test2.opt
@@ -0,0 +1 @@
+--max-error-count=32
diff --git a/storage/example/mysql-test/mtr/t/test2.rdiff b/storage/example/mysql-test/mtr/t/test2.rdiff
new file mode 100644
index 00000000..b0bf2fdf
--- /dev/null
+++ b/storage/example/mysql-test/mtr/t/test2.rdiff
@@ -0,0 +1,8 @@
+--- /usr/home/serg/Abk/mysql/5.1/mysql-test/suite/mtr/t/test2.result	2012-02-04 21:15:14.000000000 +0100
++++ /usr/home/serg/Abk/mysql/5.1/mysql-test/suite/mtr/t/test2.reject	2012-02-04 21:31:45.000000000 +0100
+@@ -1,4 +1,4 @@
+ select @@local_infile;
+ select @@max_error_count;
+ @@max_error_count
+-64
++32
diff --git a/storage/example/mysql-test/mtr/t/testsh-master.sh b/storage/example/mysql-test/mtr/t/testsh-master.sh
new file mode 100644
index 00000000..27ba77dd
--- /dev/null
+++ b/storage/example/mysql-test/mtr/t/testsh-master.sh
@@ -0,0 +1 @@
+true