Import from 'dgit -d ubuntu clone mariadb-10.1 bionic,-security,-updates'

mariadb-10.1 (1:10.1.38-0ubuntu0.18.04.2) bionic; urgency=medium

  * Restore tests to stop autopkgtest failures, by adding commits
    from debian git (salsa) listed below (LP: #1824335)
  * Revert "Remove the mariadb-test-* packages"
    - debian commit 96d3f8ab
  * Omit test plugins as they are not used by the tests and
    already deleted
    - debian commit 902dffe6
  * Define autopkgtest with isolation-container to allow service
    - debian commit 596c2581
  * Utilize upstream unstable-tests list in tests/upstream
    mysql-test-run
    - debian commit 33d85312
  * Fix typo in commit 33d85312 so skip list is not reset when
    adding lines
    - debian commit 18480afc
  * Mark selected tests as unstable so they don't stop the whole
    upload in vain
    - debian commit d44ece56
  * Disable test unit.pcre_test on s390x that was failing in
    stretch-security
    - debian commit d44ece56

 -- Dan Streetman <ddstreet@canonical.com>  Fri, 12 Apr 2019 12:34:00 -0400

debian/changelog

+mariadb-10.1 (1:10.1.38-0ubuntu0.18.04.2) bionic; urgency=medium
+
+  * Restore tests to stop autopkgtest failures, by adding commits
+    from debian git (salsa) listed below (LP: #1824335)
+  * Revert "Remove the mariadb-test-* packages"
+    - debian commit 96d3f8abcbe51894d0a5f7c7cadd5219e0dc2823
+  * Omit test plugins as they are not used by the tests and
+    already deleted
+    - debian commit 902dffe6683e43d5134b9c9b9057b42372cd47fc
+  * Define autopkgtest with isolation-container to allow service
+    - debian commit 596c2581176102b29751786e5d8fac05dde3a3e4
+  * Utilize upstream unstable-tests list in tests/upstream
+    mysql-test-run
+    - debian commit 33d85312840a625c1d607601b77c45f138405cfe
+  * Fix typo in commit 33d853128 so skip list is not reset when
+    adding lines
+    - debian commit 18480afc86838a28cd9ba89e942330c2038011e2
+  * Mark selected tests as unstable so they don't stop the whole
+    upload in vain
+    - debian commit d44ece56d7e54c7940bebe6a4614a03c1c8621f2
+  * Disable test unit.pcre_test on s390x that was failing in
+    stretch-security
+    - debian commit d44ece56d7e54c7940bebe6a4614a03c1c8621f2
+
+ -- Dan Streetman <ddstreet@canonical.com>  Fri, 12 Apr 2019 12:34:00 -0400
+
 mariadb-10.1 (1:10.1.38-0ubuntu0.18.04.1) bionic-security; urgency=medium
 
   * SECURITY UPDATE: New upstream release 10.1.38. Includes fixes for

debian/control

@@ -177,8 +177,8 @@ Description: MariaDB database core client binaries
 Package: mariadb-client-10.1
 Architecture: any
 Depends: debianutils (>=1.6),
-         mariadb-client-core-10.1 (>= ${source:Version}),
          libconfig-inifiles-perl,
+         mariadb-client-core-10.1 (>= ${source:Version}),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
@@ -256,6 +256,7 @@ Description: MariaDB database core server files
 Package: mariadb-server-10.1
 Architecture: any
 Suggests: mailx,
+          mariadb-test,
           netcat-openbsd,
           tinyca
 Recommends: libhtml-template-perl
@@ -474,3 +475,65 @@ Depends: libcrack2 (>= 2.9.0),
 Description: CrackLib Password Validation Plugin for MariaDB
  This password validation plugin uses cracklib to allow only
  sufficiently secure (as defined by cracklib) user passwords in MariaDB.
+
+Package: mariadb-test
+Architecture: any
+Depends: libmariadbclient18 (= ${binary:Version}),
+         mariadb-client-10.1 (= ${binary:Version}),
+         mariadb-server-10.1 (= ${binary:Version}),
+         mariadb-test-data (= ${source:Version}),
+         virtual-mysql-testsuite,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: mariadb-test-10.0,
+        mariadb-test-10.1,
+        mariadb-test-5.5,
+        mysql-testsuite,
+        mysql-testsuite-5.5,
+        mysql-testsuite-5.6,
+        mysql-testsuite-5.7
+Replaces: mariadb-test-10.0,
+          mariadb-test-10.1,
+          mariadb-test-5.5,
+          mysql-testsuite,
+          mysql-testsuite-5.5,
+          mysql-testsuite-5.6,
+          mysql-testsuite-5.7,
+          virtual-mysql-testsuite
+Provides: virtual-mysql-testsuite
+Suggests: patch
+Description: MariaDB database regression test suite
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
+ .
+ This package includes the regression test suite.
+
+Package: mariadb-test-data
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Breaks: mariadb-test-10.0,
+        mariadb-test-10.1,
+        mariadb-test-5.5,
+        mariadb-test-data-10.0,
+        mysql-testsuite,
+        mysql-testsuite-5.5,
+        mysql-testsuite-5.6,
+        mysql-testsuite-5.7
+Replaces: mariadb-test-10.0,
+          mariadb-test-10.1,
+          mariadb-test-5.5,
+          mariadb-test-data-10.0,
+          mysql-testsuite,
+          mysql-testsuite-5.5,
+          mysql-testsuite-5.6,
+          mysql-testsuite-5.7
+Description: MariaDB database regression test suite - data files
+ MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
+ server. SQL (Structured Query Language) is the most popular database query
+ language in the world. The main goals of MariaDB are speed, robustness and
+ ease of use.
+ .
+ This package has the architecture independent data files for the test suite.

debian/mariadb-test-data.install

+usr/share/mysql/mysql-test/collections
+usr/share/mysql/mysql-test/extra
+usr/share/mysql/mysql-test/include
+usr/share/mysql/mysql-test/plugin
+usr/share/mysql/mysql-test/r
+usr/share/mysql/mysql-test/std_data
+usr/share/mysql/mysql-test/suite
+usr/share/mysql/mysql-test/t
+usr/share/mysql/mysql-test/unstable-tests

debian/mariadb-test-data.lintian-overrides

+# OK, this file is part of test suite and only used for a test
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_myisam.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_7_innodb.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_innodb.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_6.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_3.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_myisam_innodb.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_11.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_4_myisam.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_7_myisam.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_14.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/suite/parts/r/partition_exch_qa_4_innodb.result
+mariadb-test-data: executable-not-elf-or-script usr/share/mysql/mysql-test/plugin/oqgraph/oqgraph/maintainer-general-record.sh

debian/mariadb-test.install

+usr/bin/mysql_client_test
+usr/bin/mysql_client_test_embedded
+usr/bin/mysqltest
+usr/bin/mysqltest_embedded
+usr/share/man/man1/mysql-stress-test.pl.1
+usr/share/man/man1/mysql-test-run.pl.1
+usr/share/man/man1/mysql_client_test.1
+usr/share/man/man1/mysql_client_test_embedded.1
+usr/share/man/man1/mysqltest.1
+usr/share/man/man1/mysqltest_embedded.1
+usr/share/mysql/mysql-test/README
+usr/share/mysql/mysql-test/README.gcov
+usr/share/mysql/mysql-test/README.stress
+usr/share/mysql/mysql-test/disabled.def
+usr/share/mysql/mysql-test/lib
+usr/share/mysql/mysql-test/mysql-stress-test.pl
+usr/share/mysql/mysql-test/mysql-test-run.pl
+usr/share/mysql/mysql-test/purify.supp
+usr/share/mysql/mysql-test/suite.pm
+usr/share/mysql/mysql-test/valgrind.supp

debian/mariadb-test.links

+usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mtr
+usr/share/mysql/mysql-test/mysql-test-run.pl usr/share/mysql/mysql-test/mysql-test-run

debian/mariadb-test.lintian-overrides

+# OK, this file is part of test suite and only used for a test
+mariadb-test: arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process
+mariadb-test: executable-not-elf-or-script usr/share/mysql/mysql-test/lib/generate-ssl-certs.sh

debian/not-installed

@@ -357,35 +357,6 @@ usr/share/mysql/systemd/mariadb@.service
 usr/share/man/man1/mysqlbug.1
 usr/share/man/man1/mysql.server.1
 usr/share/man/man1/my_safe_process.1
-usr/share/mysql/mysql-test/collections
-usr/share/mysql/mysql-test/extra
-usr/share/mysql/mysql-test/include
-usr/share/mysql/mysql-test/plugin
-usr/share/mysql/mysql-test/r
-usr/share/mysql/mysql-test/std_data
-usr/share/mysql/mysql-test/suite
-usr/share/mysql/mysql-test/t
-usr/share/mysql/mysql-test/unstable-tests
-usr/bin/mysql_client_test
-usr/bin/mysql_client_test_embedded
-usr/bin/mysqltest
-usr/bin/mysqltest_embedded
-usr/share/man/man1/mysql-stress-test.pl.1
-usr/share/man/man1/mysql-test-run.pl.1
-usr/share/man/man1/mysql_client_test.1
-usr/share/man/man1/mysql_client_test_embedded.1
-usr/share/man/man1/mysqltest.1
-usr/share/man/man1/mysqltest_embedded.1
-usr/share/mysql/mysql-test/README
-usr/share/mysql/mysql-test/README.gcov
-usr/share/mysql/mysql-test/README.stress
-usr/share/mysql/mysql-test/disabled.def
-usr/share/mysql/mysql-test/lib
-usr/share/mysql/mysql-test/mysql-stress-test.pl
-usr/share/mysql/mysql-test/mysql-test-run.pl
-usr/share/mysql/mysql-test/purify.supp
-usr/share/mysql/mysql-test/suite.pm
-usr/share/mysql/mysql-test/valgrind.supp
 usr/share/groonga-normalizer-mysql/README.md
 usr/share/groonga-normalizer-mysql/lgpl-2.0.txt
 usr/share/mysql/mroonga/COPYING

debian/tests/control

 Tests: smoke
 Depends: mariadb-server-10.1
-Restrictions: allow-stderr needs-root
+Restrictions: allow-stderr needs-root isolation-container
 
 Tests: upstream
 Depends: mariadb-test

debian/tests/upstream

@@ -21,7 +21,12 @@ echo "using vardir: $WORKDIR/var"
 echo "using tmpdir: $WORKDIR/tmp"
 
 echo "Setting up skip-tests-list"
-cat > $SKIP_TEST_LST << EOF
+
+# Use original unstable-tests list as base to also skip all tests upstream
+# considers unstable
+cp /usr/share/mysql/mysql-test/unstable-tests $SKIP_TEST_LST
+
+cat >> $SKIP_TEST_LST << EOF
 binlog.binlog_server_start_options : Requires writable /usr
 main.ctype_uca : Requires writable /usr
 rpl.rpl_gtid_mode : Requires starting server as root ref http://bugs.mysql.com/bug.php?id=70517

debian/unstable-tests.amd64

+mroonga/storage.index_multiple_column_range_all_used_less_than                             : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.index_multiple_column_range_all_used_less_than_or_equal                    : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.index_multiple_column_range_partially_used_have_prefix_less_than           : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.index_multiple_column_range_partially_used_have_prefix_less_than_or_equal  : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.index_multiple_column_range_partially_used_no_prefix_less_than             : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.index_multiple_column_range_partially_used_no_prefix_less_than_or_equal    : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.optimization_order_limit_optimized_datetime_less_than                      : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.optimization_order_limit_optimized_datetime_less_than_or_equal             : MDEV-16127 - mroonga/storage.* tests fail with GCC 8

debian/unstable-tests.arm64

+mroonga/storage.index_multiple_column_range_all_used_less_than                             : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.index_multiple_column_range_all_used_less_than_or_equal                    : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.index_multiple_column_range_partially_used_have_prefix_less_than           : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.index_multiple_column_range_partially_used_have_prefix_less_than_or_equal  : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.index_multiple_column_range_partially_used_no_prefix_less_than             : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.index_multiple_column_range_partially_used_no_prefix_less_than_or_equal    : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.optimization_order_limit_optimized_datetime_less_than                      : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.optimization_order_limit_optimized_datetime_less_than_or_equal             : MDEV-16127 - mroonga/storage.* tests fail with GCC 8

debian/unstable-tests.ppc64el

+mroonga/storage.index_multiple_column_range_all_used_less_than                             : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.index_multiple_column_range_all_used_less_than_or_equal                    : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.index_multiple_column_range_partially_used_have_prefix_less_than           : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.index_multiple_column_range_partially_used_have_prefix_less_than_or_equal  : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.index_multiple_column_range_partially_used_no_prefix_less_than             : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.index_multiple_column_range_partially_used_no_prefix_less_than_or_equal    : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.optimization_order_limit_optimized_datetime_less_than                      : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+mroonga/storage.optimization_order_limit_optimized_datetime_less_than_or_equal             : MDEV-16127 - mroonga/storage.* tests fail with GCC 8
+binlog.binlog_mysqlbinlog_row_innodb : MDEV-10604 - Known unstable test
+binlog.binlog_mysqlbinlog_row_myisam : MDEV - not reported yet
+main.select_pkeycache                : MDEV-15430 - Related type_float.test floating point error
+main.select                          : MDEV-15430 - Related type_float.test floating point error
+main.select_jcl6                     : MDEV-15430 - Related type_float.test floating point error
+main.type_float                      : MDEV-15430 - Related type_float.test floating point error
+main.type_newdecimal                 : MDEV-15430 - Related type_float.test floating point error
+main.type_ranges                     : MDEV-15430 - Related type_float.test floating point error

debian/unstable-tests.s390x

+unit.pcre_test : MDEV-17865