Merge 10.7 into 10.8

3 files changed, 84 insertions, 13 deletions

diff --git a/debian/mariadb-test-data.lintian-overrides b/debian/mariadb-test-data.lintian-overrides
index 630e9fcab1e..de210af2a39 100644
--- a/debian/mariadb-test-data.lintian-overrides
+++ b/debian/mariadb-test-data.lintian-overrides
@@ -1,6 +1,13 @@
 # These should be moved, see https://jira.mariadb.org/browse/MDEV-21654
 arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so
 arch-independent-package-contains-binary-or-object usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so
+# Mainly for support for *BSD family. Not right way to do but this is test package and not for production
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/std_data/checkDBI_DBD-MariaDB.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/funcs_1/lib/DataGen_local.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/funcs_1/lib/DataGen_modify.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/suite/rpl/extension/checksum.pl]
 # Intentional for test files
 national-encoding usr/share/mysql/mysql-test/*
 # Extra test documentation files that really need to be kept in context in test directory
diff --git a/debian/mariadb-test.lintian-overrides b/debian/mariadb-test.lintian-overrides
index 9de1b3784ff..b9f45b862b5 100644
--- a/debian/mariadb-test.lintian-overrides
+++ b/debian/mariadb-test.lintian-overrides
@@ -1,3 +1,8 @@
 # These should be moved, see https://jira.mariadb.org/browse/MDEV-21653
 arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/my_safe_process
 arch-dependent-file-in-usr-share usr/share/mysql/mysql-test/lib/My/SafeProcess/wsrep_check_version
+# Mainly for support for *BSD family. Not right way to do but this is test package and not for production
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/lib/process-purecov-annotations.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/lib/v1/mysql-test-run.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/mysql-stress-test.pl]
+incorrect-path-for-interpreter /usr/bin/env perl != /usr/bin/perl [usr/share/mysql/mysql-test/mysql-test-run.pl]
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 91b4f531693..998aa4810b1 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -4,23 +4,82 @@ version-substvar-for-external-package mariadb-client-core-10.8 -> mysql-client-5
 version-substvar-for-external-package mariadb-server-10.8 -> mysql-server
 version-substvar-for-external-package libmariadb-dev -> libmysqlclient-dev
 version-substvar-for-external-package libmariadb-dev -> libmysqld-dev
-version-substvar-for-external-package mariadb-server-10.8 -> mysql-client-5.5
-version-substvar-for-external-package mariadb-server-10.8 -> mysql-client-5.6
-version-substvar-for-external-package mariadb-server-10.8 -> mysql-client-5.7
-version-substvar-for-external-package mariadb-server-10.8 -> mysql-client-8.0
-version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-5.1
-version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-5.5
-version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-5.6
-version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-5.7
-version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-8.0
+version-substvar-for-external-package mariadb-server-10.8 -> mysql-client-5.*
+version-substvar-for-external-package mariadb-server-10.8 -> mysql-client-8.*
+version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-5.*
+version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-8.*
 version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev
 # ColumnStore not used in Debian, safe to ignore. Reported upstream in https://jira.mariadb.org/browse/MDEV-24124
 source-is-missing storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2
 # Must be fixed upstream
-source-is-missing storage/mroonga/vendor/groonga/examples/dictionary/html/js/jquery-ui-1.8.18.custom.js*
+source-is-missing storage/mroonga/vendor/groonga/examples/dictionary/html/js/jquery-ui-*.custom.js
 # Intentional control relationships
-version-substvar-for-external-package Replaces * ${source:Version} libmariadbd-dev -> libmariadbclient-dev
-version-substvar-for-external-package Replaces * ${source:Version} libmariadb-dev -> libmysqlclient-dev
-version-substvar-for-external-package Replaces * ${source:Version} libmariadb-dev -> libmysqld-dev
+version-substvar-for-external-package Replaces * libmariadbd-dev -> libmariadbclient-dev
+version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqlclient-dev
+version-substvar-for-external-package Replaces * libmariadb-dev -> libmysqld-dev
 # We can't change build dependencies on a stable branch (10.5..10.8) so just override this
 missing-build-dependency-for-dh-addon systemd *
+# Data or test files where long lines are justified
+very-long-line-length-in-source-file *.test *
+very-long-line-length-in-source-file *.result *
+very-long-line-length-in-source-file BUILD/compile-*
+very-long-line-length-in-source-file *COPYING.rtf *
+# These are mainly found under extra/wolfssl
+very-long-line-length-in-source-file *.cproject *
+very-long-line-length-in-source-file *.md *
+very-long-line-length-in-source-file *.scfg *
+very-long-line-length-in-source-file *.launch *
+very-long-line-length-in-source-file extra/wolfssl/wolfssl/IDE/Espressif/ESP-IDF/test/test_wolfssl.c *
+very-long-line-length-in-source-file extra/wolfssl/wolfssl/configure.ac *
+very-long-line-length-in-source-file extra/wolfssl/wolfssl/doc/formats/html/html_changes/tabs.css *
+# Preprocessed C files which have long lines
+very-long-line-length-in-source-file extra/wolfssl/wolfssl/wolfcrypt/src/*.i *
+# These are all results for test cases and similar so they can be
+# especially formatted to be too long
+very-long-line-length-in-source-file mysql-test/*.dump *
+very-long-line-length-in-source-file mysql-test/*.inc *
+very-long-line-length-in-source-file mysql-test/*.rdiff *
+very-long-line-length-in-source-file mysql-test/*.txt *
+very-long-line-length-in-source-file mysql-test/*.weekly *
+# Test file
+very-long-line-length-in-source-file plugin/handler_socket/regtest/test_01_lib/test19.expected *
+# SQL source file that has very long inserts/selects
+very-long-line-length-in-source-file mysql-test/std_data/init_file_longline_3816.sql *
+very-long-line-length-in-source-file scripts/fill_help_tables.sql *
+very-long-line-length-in-source-file scripts/mysql_system_tables.sql *
+very-long-line-length-in-source-file scripts/mysql_test_data_timezone.sql *
+# Machine formated HTML
+very-long-line-length-in-source-file sql/share/charsets/languages.html *
+very-long-line-length-in-source-file sql/share/errmsg-utf8.txt *
+# Very long test string
+very-long-line-length-in-source-file storage/archive/archive_test.c line 30 is 1051 characters long (>512)
+# autogenerated thrift file
+very-long-line-length-in-source-file storage/cassandra/gen-cpp/cassandra_types.h *
+# ColumnStore ignores
+# In Directory mysql-test are some long test includes
+very-long-line-length-in-source-file storage/columnstore/columnstore/.drone.jsonnet *
+very-long-line-length-in-source-file storage/columnstore/columnstore/CMakeLists.txt *
+very-long-line-length-in-source-file storage/columnstore/columnstore/mysql-test/columnstore/csinternal/include/autopilot_create_datatypetestm_tables.inc *
+very-long-line-length-in-source-file storage/columnstore/columnstore/mysql-test/columnstore/csinternal/include/autopilot_create_datatypeupdate_table.inc *
+very-long-line-length-in-source-file storage/columnstore/columnstore/*.xmi *
+very-long-line-length-in-source-file storage/columnstore/columnstore/dbcon/doc/q19_plan.txt *
+very-long-line-length-in-source-file storage/columnstore/columnstore/utils/udfsdk/docs/source/reference/mcsv1Context.rst *
+very-long-line-length-in-source-file storage/columnstore/columnstore/utils/winport/win_setup_mysql_part1.sql *
+# Minified CSS files. These appear in several places
+very-long-line-length-in-source-file *badge_only.css *
+very-long-line-length-in-source-file *theme.css line *
+# General storage ignores
+very-long-line-length-in-source-file storage/mroonga/vendor/groonga/examples/dictionary/html/css/smoothness/jquery-ui-1.8.12.custom.css *
+very-long-line-length-in-source-file storage/rocksdb/mysql-test/rocksdb/t/bypass_select_basic_bloom-master.opt *
+very-long-line-length-in-source-file storage/rocksdb/mysql-test/rocksdb/t/type_enum.inc *
+very-long-line-length-in-source-file storage/rocksdb/mysql-test/rocksdb/t/type_set.inc *
+very-long-line-length-in-source-file storage/rocksdb/rocksdb/docs/_includes/footer.html *
+very-long-line-length-in-source-file storage/rocksdb/rocksdb/docs/_posts/*.markdown line *
+very-long-line-length-in-source-file storage/spider/mysql-test/spider/bugfix/include/sql_mode_init.inc *
+very-long-line-length-in-source-file storage/tokudb/PerconaFT/cmake_modules/TokuBuildTagDatabases.cmake *
+very-long-line-length-in-source-file storage/tokudb/PerconaFT/third_party/xz-4.999.9beta/m4/po.m4 *
+# These are generated files which should not make any harm
+source-contains-autogenerated-visual-c++-file storage/columnstore/columnstore/*.rc
+source-contains-autogenerated-visual-c++-file storage/columnstore/columnstore/*.h
+source-contains-autogenerated-visual-c++-file win/upgrade_wizard/resource.h
+source-contains-autogenerated-visual-c++-file win/upgrade_wizard/upgrade.rc