Merging debian version 1:10.11.7-2.

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

15 files changed, 138 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index 7e948c28..299fba06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+mariadb (1:10.11.7-2) unstable; urgency=medium
+
+  [ Graham Inggs ]
+  * Rename libraries for 64-bit time_t transition (Closes: #1062841)
+
+  [ Otto Kekäläinen ]
+  * Salsa-CI: Adopt new libmariadbd19t64 library name in CI
+  * Remove obsolete Lintian override:
+    package-supports-alternative-init-but-no-init.d-script
+  * Disable more tests not passing for sparc64 on Debian
+  * Add patch to fix hurd-i386 build failure (Closes: #1063739)
+  * Add patch to partially revert upstream c432c9ef (Closes: #1063738)
+  * Disable table_value_constr failing on armhf on Launchpad
+  * Backport patch for MDEV-32975 (collation fix for PHP connector)
+
+ -- Otto Kekäläinen <otto@debian.org>  Fri, 01 Mar 2024 17:43:11 -0800
+
 mariadb (1:10.11.7-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 070f75ac..6f088752 100644
--- a/debian/control
+++ b/debian/control
@@ -135,7 +135,10 @@ Description: MariaDB database client library
  .
  This package includes the client library.
 
-Package: libmariadbd19
+Package: libmariadbd19t64
+Provides: ${t64:Provides}
+Replaces: libmariadbd19
+Breaks: libmariadbd19 (<< ${source:Version})
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
@@ -155,7 +158,7 @@ Section: libdevel
 Provides: libmysqld-dev
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libmariadb-dev (= ${binary:Version}),
-         libmariadbd19 (= ${binary:Version}),
+         libmariadbd19t64 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: libmariadb-dev (<< 1:10.4),
diff --git a/debian/libmariadbd19.install b/debian/libmariadbd19t64.install
index cb627204..cb627204 100644
--- a/debian/libmariadbd19.install
+++ b/debian/libmariadbd19t64.install
diff --git a/debian/libmariadbd19.lintian-overrides b/debian/libmariadbd19t64.lintian-overrides
index a7fd30db..acf42a22 100644
--- a/debian/libmariadbd19.lintian-overrides
+++ b/debian/libmariadbd19t64.lintian-overrides
@@ -4,3 +4,4 @@ spelling-error-in-binary thats that's [usr/lib/*/libmariadbd.so.19]
 spelling-error-in-binary theres there's [usr/lib/*/libmariadbd.so.19]
 # False positive from Lintian, these strings are nowhere in test in source code
 spelling-error-in-binary AfE Safe [usr/lib/*/libmariadbd.so.19]
+libmariadbd19t64: package-name-doesnt-match-sonames libmariadbd19
diff --git a/debian/mariadb-server.lintian-overrides b/debian/mariadb-server.lintian-overrides
index b0530410..b39e9989 100644
--- a/debian/mariadb-server.lintian-overrides
+++ b/debian/mariadb-server.lintian-overrides
@@ -8,6 +8,3 @@ spelling-error-in-binary theres there's [usr/bin/*]
 spelling-error-in-binary AfE Safe [usr/bin/*]
 # Intentional in-context documentation
 package-contains-documentation-outside-usr-share-doc [usr/share/mysql/errmsg-utf8.txt]
-# mysql(d).service are symlinks to mariadb.service, and there is indeed a init.d/mariadb shipped
-package-supports-alternative-init-but-no-init.d-script [usr/lib/systemd/system/mysql.service]
-package-supports-alternative-init-but-no-init.d-script [usr/lib/systemd/system/mysqld.service]
diff --git a/debian/patches/1063738-revert-c432c9ef.patch b/debian/patches/1063738-revert-c432c9ef.patch
new file mode 100644
index 00000000..d13fa9db
--- /dev/null
+++ b/debian/patches/1063738-revert-c432c9ef.patch
@@ -0,0 +1,23 @@
+Date: Wed, 21 Feb 2024 20:34:12 -0800
+Subject: [PATCH] Revert compile_time_assert() changes from "MDEV-32862 MYSQL struct in C/C and server differs"
+
+This partially reverts commit c432c9ef19bf6ff40ab9551bcae202d7e1319878 which
+most likely caused the regression that broke builds on many 32-bit platforms.
+
+--- a/tests/mysql_client_fw.c
++++ b/tests/mysql_client_fw.c
+@@ -1430,14 +1430,6 @@ int main(int argc, char **argv)
+     tests_to_run[i]= NULL;
+   }
+ 
+-#ifdef _WIN32
+-  /* must be the same in C/C and embedded, 1208 on 64bit, 968 on 32bit */
+-  compile_time_assert(sizeof(MYSQL) == 60*sizeof(void*)+728);
+-#else
+-  /* must be the same in C/C and embedded, 1272 on 64bit, 964 on 32bit */
+-  compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656);
+-#endif
+-
+   if (mysql_server_init(embedded_server_arg_count,
+                         embedded_server_args,
+                         (char**) embedded_server_groups))
diff --git a/debian/patches/3039-os-data-file-no-o-direct.patch b/debian/patches/3039-os-data-file-no-o-direct.patch
new file mode 100644
index 00000000..3a55269f
--- /dev/null
+++ b/debian/patches/3039-os-data-file-no-o-direct.patch
@@ -0,0 +1,32 @@
+Forwarded: https://github.com/MariaDB/server/pull/3039
+Origin: https://patch-diff.githubusercontent.com/raw/MariaDB/server/pull/3039.patch
+From: Daniel Black <daniel@mariadb.org>
+Date: Fri, 2 Feb 2024 11:38:00 +1100
+Subject: [PATCH] MDEV-33095 MariaDB-backup - no OS_DATA_FILE_NO_O_DIRECT on
+ some platforms
+
+Postfix for a6290a5bc5f3cba096854595c354d19d9267743d, in 10.11
+where OS_DATA_FILE_NO_O_DIRECT gets used. Same #ifdef conditions
+as other uses of OS_DATA_FILE_NO_O_DIRECT.
+
+Noticed on aarch64-macos builder.
+---
+ extra/mariabackup/xtrabackup.cc | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/extra/mariabackup/xtrabackup.cc
++++ b/extra/mariabackup/xtrabackup.cc
+@@ -2428,7 +2428,12 @@ static bool innodb_init()
+   os_file_delete_if_exists_func(ib_logfile0.c_str(), nullptr);
+   os_file_t file= os_file_create_func(ib_logfile0.c_str(),
+                                       OS_FILE_CREATE, OS_FILE_NORMAL,
+-                                      OS_DATA_FILE_NO_O_DIRECT, false, &ret);
++#if defined _WIN32 || defined HAVE_FCNTL_DIRECT
++                                      OS_DATA_FILE_NO_O_DIRECT,
++#else
++                                      OS_DATA_FILE,
++#endif
++				      false, &ret);
+   if (!ret)
+   {
+   invalid_log:
diff --git a/debian/patches/MDEV-32975-chartset-collation-fix-php.patch b/debian/patches/MDEV-32975-chartset-collation-fix-php.patch
new file mode 100644
index 00000000..4fa54955
--- /dev/null
+++ b/debian/patches/MDEV-32975-chartset-collation-fix-php.patch
@@ -0,0 +1,45 @@
+Origin: https://github.com/MariaDB/server/commit/1b37cb71f44549c94acf8914cf93d43a4293a449
+Bug: https://jira.mariadb.org/browse/MDEV-32975
+From: Alexander Barkov <bar@mariadb.com>
+Date: Fri, 26 Jan 2024 13:12:03 +0400
+Subject: [PATCH] MDEV-32975 Default charset doesn't work with PHP MySQLi
+ extension
+
+When sending the server default collation ID to the client
+in the handshake packet, translate a 2-byte collation ID
+to the ID of the default collation for the character set.
+---
+ sql/sql_acl.cc | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+--- a/sql/sql_acl.cc
++++ b/sql/sql_acl.cc
+@@ -13354,8 +13354,27 @@ static bool send_server_handshake_packet
+   *end++= 0;
+ 
+   int2store(end, thd->client_capabilities);
++
++  CHARSET_INFO *handshake_cs= default_charset_info;
++  if (handshake_cs->number > 0xFF)
++  {
++    /*
++      A workaround for a 2-byte collation ID: translate it into
++      the ID of the primary collation of this character set.
++    */
++    CHARSET_INFO *cs= get_charset_by_csname(handshake_cs->cs_name.str,
++                                            MY_CS_PRIMARY, MYF(MY_WME));
++    /*
++      cs should not normally be NULL, however it may be possible
++      with a dynamic character set incorrectly defined in Index.xml.
++      For safety let's fallback to latin1 in case cs is NULL.
++    */
++    handshake_cs= cs ? cs : &my_charset_latin1;
++  }
++
+   /* write server characteristics: up to 16 bytes allowed */
+-  end[2]= (char) default_charset_info->number;
++  end[2]= (char) handshake_cs->number;
++
+   int2store(end+3, mpvio->auth_info.thd->server_status);
+   int2store(end+5, thd->client_capabilities >> 16);
+   end[7]= data_len;
diff --git a/debian/patches/series b/debian/patches/series
index a84dbe36..8ea54cc5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,6 @@ fix-spelling-libmariadb.patch
 2980-riscv-use-rdtime.patch
 install-files-into-usr.patch
 1006531-hurd-no-auth-socket.patch
+3039-os-data-file-no-o-direct.patch
+1063738-revert-c432c9ef.patch
+MDEV-32975-chartset-collation-fix-php.patch
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index 92fc1186..3bcda390 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -6,7 +6,7 @@ include:
 
 # Override Salsa-CI with MariaDB specific variations
 variables:
-  BUILT_PACKAGES: "libmariadb-dev libmariadb-dev-compat libmariadb3 libmariadbd19 libmariadbd-dev mariadb-common mariadb-client-core mariadb-client mariadb-server-core mariadb-server mariadb-backup mariadb-plugin-connect mariadb-plugin-s3 mariadb-plugin-rocksdb mariadb-plugin-oqgraph mariadb-plugin-mroonga mariadb-plugin-spider mariadb-plugin-gssapi-server mariadb-plugin-gssapi-client mariadb-plugin-cracklib-password-check mariadb-plugin-hashicorp-key-management mariadb-plugin-provider-bzip2 mariadb-plugin-provider-lz4 mariadb-plugin-provider-lzma mariadb-plugin-provider-lzo mariadb-plugin-provider-snappy mariadb-test mariadb-test-data"
+  BUILT_PACKAGES: "libmariadb-dev libmariadb-dev-compat libmariadb3 libmariadbd19t64 libmariadbd-dev mariadb-common mariadb-client-core mariadb-client mariadb-server-core mariadb-server mariadb-backup mariadb-plugin-connect mariadb-plugin-s3 mariadb-plugin-rocksdb mariadb-plugin-oqgraph mariadb-plugin-mroonga mariadb-plugin-spider mariadb-plugin-gssapi-server mariadb-plugin-gssapi-client mariadb-plugin-cracklib-password-check mariadb-plugin-hashicorp-key-management mariadb-plugin-provider-bzip2 mariadb-plugin-provider-lz4 mariadb-plugin-provider-lzma mariadb-plugin-provider-lzo mariadb-plugin-provider-snappy mariadb-test mariadb-test-data"
   DEB_BUILD_OPTIONS: "nocheck noautodbgsym"
   RELEASE: sid
   # Reprotest works, but takes very long time and often fails due to timeouts.
@@ -205,7 +205,7 @@ blhc:
   - *test-enable-artifacts-repo
   - apt-get install -yq --no-install-recommends libmariadb-dev-compat libmariadbd-dev
   # Installs 31 packages, including:
-  # libmariadb3 libmariadb-dev libmariadb-dev-compat libmariadbd19 libmariadbd-dev
+  # libmariadb3 libmariadb-dev libmariadb-dev-compat libmariadbd19t64 libmariadbd-dev
 
 .test-full-upgrade-libs: &test-full-upgrade-libs
   - *test-enable-artifacts-repo
@@ -366,7 +366,9 @@ simple upgrade:
   stage: upgrade MariaDB
   script:
     - *test-prepare-container
-    - apt-get install -qq --yes 'default-mysql*' ${BUILT_PACKAGES}
+    # @TODO: Re-enable the line below once libmariadbd19t64 exists in repository
+    #- apt-get install -qq --yes 'default-mysql*' ${BUILT_PACKAGES}
+    - apt-get install -qq --yes 'default-mysql*' libmariadb-dev libmariadb-dev-compat libmariadb3 libmariadbd19 libmariadbd-dev mariadb-common mariadb-client-core mariadb-client mariadb-server-core mariadb-server mariadb-backup mariadb-plugin-connect mariadb-plugin-s3 mariadb-plugin-rocksdb mariadb-plugin-oqgraph mariadb-plugin-mroonga mariadb-plugin-spider mariadb-plugin-gssapi-server mariadb-plugin-gssapi-client mariadb-plugin-cracklib-password-check mariadb-plugin-hashicorp-key-management mariadb-plugin-provider-bzip2 mariadb-plugin-provider-lz4 mariadb-plugin-provider-lzma mariadb-plugin-provider-lzo mariadb-plugin-provider-snappy mariadb-test mariadb-test-data
     - *test-full-upgrade
     - service mariadb status # There is no init.d/mysql in MariaDB 10.5+
     - *test-verify-final
@@ -673,7 +675,7 @@ libmysql* to libmariadb* upgrade:
     - apt-get install -qq --yes libmariadb-dev-compat
     - pkg-config --cflags mysqlclient # mysqlclient.pc from compat package
     - pkg-config --list-all
-    - apt-get install -qq --yes libmariadbd19
+    - apt-get install -qq --yes libmariadbd19t64
     - pkg-config --list-all
     - apt-get install -qq --yes libmariadbd-dev
     - pkg-config --list-all
diff --git a/debian/unstable-tests.armel b/debian/unstable-tests.armel
index fc739e56..88d06b44 100644
--- a/debian/unstable-tests.armel
+++ b/debian/unstable-tests.armel
@@ -1,4 +1,5 @@
 main.partition_key_cache : MDEV-23427
+main.table_value_constr : MDEV-33520
 maria.maria-purge : MDEV-31349
 type_test.type_test_double : MDEV-22243, but wasn't actually fixed yet
 unit.conc_connection : CONC-640: unit.conc_connection fails on test_conc21
diff --git a/debian/unstable-tests.armhf b/debian/unstable-tests.armhf
index 35b7fccf..3974b331 100644
--- a/debian/unstable-tests.armhf
+++ b/debian/unstable-tests.armhf
@@ -1,3 +1,4 @@
+main.table_value_constr : MDEV-33520
 main.xml : MDEV-21968
 maria.maria-purge : MDEV-31349
 type_test.type_test_double : MDEV-22243, but wasn't actually fixed yet
diff --git a/debian/unstable-tests.hppa b/debian/unstable-tests.hppa
index 8557b5b9..3fa55709 100644
--- a/debian/unstable-tests.hppa
+++ b/debian/unstable-tests.hppa
@@ -9,6 +9,7 @@ main.index_intersect : MDEV-23921
 main.index_intersect_innodb : MDEV-23921
 main.join_cache_notasan : MDEV-31893 (fixed but perhaps not for hppa)
 main.rowid_filter_innodb : MDEV-32375
+main.table_value_constr : MDEV-33520
 maria.maria-purge : MDEV-31349
 repair_symlink-5543  : MDEV-23920
 type_test.type_test_double : MDEV-22243, but wasn't actually fixed yet
diff --git a/debian/unstable-tests.powerpc b/debian/unstable-tests.powerpc
index 8c7bbb7e..4438338f 100644
--- a/debian/unstable-tests.powerpc
+++ b/debian/unstable-tests.powerpc
@@ -1,4 +1,5 @@
 main.func_json_notembedded : MDEV-30518 / MDEV-27955
+main.table_value_constr : MDEV-33520
 maria.maria-purge : MDEV-31349
 type_test.type_test_double : MDEV-22243, but wasn't actually fixed yet
 unit.conc_connection : CONC-640: unit.conc_connection fails on test_conc21
diff --git a/debian/unstable-tests.sparc64 b/debian/unstable-tests.sparc64
index 63cf534c..e397067d 100644
--- a/debian/unstable-tests.sparc64
+++ b/debian/unstable-tests.sparc64
@@ -7,10 +7,12 @@ main.func_math : MDEV-27954
 main.func_str : MDEV-27954
 main.group_by : MDEV-27954
 main.group_by_null : MDEV-27954
+main.index_merge_innodb : MDEV-30728
 main.long_unique_bugs : MDEV-30928
 main.partition_order : MDEV-27954
 main.repair_symlink-5543 : MDEV-23920
 main.type_datetime : MDEV-27954
+main.xa_prepared_binlog_off : Likely also MDEV-30728
 main.xml : MDEV-27954
 maria.maria-purge : MDEV-31349
 type_test.type_test_double : MDEV-22243, but wasn't actually fixed yet