From 06eaf7232e9a920468c0f8d74dcf2fe8b555501c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 13 Apr 2024 14:24:36 +0200 Subject: Adding upstream version 1:10.11.6. Signed-off-by: Daniel Baumann --- storage/example/mysql-test/README | 2 ++ storage/example/mysql-test/mtr/suite.pm | 8 ++++++++ storage/example/mysql-test/mtr/t/combs.combinations | 2 ++ storage/example/mysql-test/mtr/t/inc.inc | 1 + storage/example/mysql-test/mtr/t/newcomb.combinations | 2 ++ storage/example/mysql-test/mtr/t/over.result | 4 ++++ storage/example/mysql-test/mtr/t/over.test | 8 ++++++++ storage/example/mysql-test/mtr/t/self.result | 6 ++++++ storage/example/mysql-test/mtr/t/self.test | 8 ++++++++ storage/example/mysql-test/mtr/t/source.result | 3 +++ storage/example/mysql-test/mtr/t/test2,c2.result | 4 ++++ storage/example/mysql-test/mtr/t/test2.opt | 1 + storage/example/mysql-test/mtr/t/test2.rdiff | 8 ++++++++ storage/example/mysql-test/mtr/t/testsh-master.sh | 1 + 14 files changed, 58 insertions(+) create mode 100644 storage/example/mysql-test/README create mode 100644 storage/example/mysql-test/mtr/suite.pm create mode 100644 storage/example/mysql-test/mtr/t/combs.combinations create mode 100644 storage/example/mysql-test/mtr/t/inc.inc create mode 100644 storage/example/mysql-test/mtr/t/newcomb.combinations create mode 100644 storage/example/mysql-test/mtr/t/over.result create mode 100644 storage/example/mysql-test/mtr/t/over.test create mode 100644 storage/example/mysql-test/mtr/t/self.result create mode 100644 storage/example/mysql-test/mtr/t/self.test create mode 100644 storage/example/mysql-test/mtr/t/source.result create mode 100644 storage/example/mysql-test/mtr/t/test2,c2.result create mode 100644 storage/example/mysql-test/mtr/t/test2.opt create mode 100644 storage/example/mysql-test/mtr/t/test2.rdiff create mode 100644 storage/example/mysql-test/mtr/t/testsh-master.sh (limited to 'storage/example/mysql-test') diff --git a/storage/example/mysql-test/README b/storage/example/mysql-test/README new file mode 100644 index 00000000..0af43c76 --- /dev/null +++ b/storage/example/mysql-test/README @@ -0,0 +1,2 @@ +These tests don't have anything to do with the EXAMPLE engine itself, +but they show how mysql-test handles overlays diff --git a/storage/example/mysql-test/mtr/suite.pm b/storage/example/mysql-test/mtr/suite.pm new file mode 100644 index 00000000..f7ff4224 --- /dev/null +++ b/storage/example/mysql-test/mtr/suite.pm @@ -0,0 +1,8 @@ +package My::Suite::MTR::Example; + +@ISA = qw(My::Suite); + +sub skip_combinations {( + 't/combs.combinations' => [ 'c1' ], +)} +bless { }; 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 -- cgit v1.2.3