Merge 10.3 into 10.4

MariaDB · Sep 13, 2022 · 18795f5 · 18795f5
2 parents 9a8faee + 68ce023
commit 18795f5
Show file tree

Hide file tree

Showing 1,127 changed files with 48,150 additions and 48,034 deletions.
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
@@ -283,7 +283,7 @@ ELSEIF(RPM MATCHES "sles")
     "mariadb-server = %{version}-%{release}"
   )
 ENDIF()
-IF(RPM MATCHES "fedora" OR RPM MATCHES "(rhel|centos)8")
+IF(RPM MATCHES "fedora" OR RPM MATCHES "(rocky|alma|rhel|centos)8")
   SET(PYTHON_SHEBANG "/usr/bin/python3" CACHE STRING "python shebang")
 ENDIF()
 

diff --git a/debian/mariadb-plugin-gssapi-server.install b/debian/mariadb-plugin-gssapi-server.install
@@ -1,2 +1,2 @@
-etc/mysql/conf.d/auth_gssapi.cnf etc/mysql/mariadb.conf.d
+etc/mysql/conf.d/auth_gssapi.cnf
 usr/lib/mysql/plugin/auth_gssapi.so
diff --git a/debian/mariadb-plugin-oqgraph.install b/debian/mariadb-plugin-oqgraph.install
@@ -1,2 +1,2 @@
-etc/mysql/conf.d/oqgraph.cnf etc/mysql/mariadb.conf.d
+etc/mysql/conf.d/oqgraph.cnf
 usr/lib/mysql/plugin/ha_oqgraph.so
diff --git a/debian/mariadb-plugin-rocksdb.install b/debian/mariadb-plugin-rocksdb.install
@@ -1,4 +1,4 @@
-etc/mysql/conf.d/rocksdb.cnf etc/mysql/mariadb.conf.d
+etc/mysql/conf.d/rocksdb.cnf
 usr/bin/myrocks_hotbackup
 usr/bin/mysql_ldb
 usr/bin/sst_dump

diff --git a/debian/mariadb-plugin-tokudb.install b/debian/mariadb-plugin-tokudb.install
@@ -1,4 +1,4 @@
-etc/mysql/conf.d/tokudb.cnf etc/mysql/mariadb.conf.d
+etc/mysql/conf.d/tokudb.cnf
 etc/systemd/system/mariadb.service.d/tokudb.conf
 usr/bin/tokuft_logprint
 usr/bin/tokuftdump

diff --git a/mysql-test/main/alias.result b/mysql-test/main/alias.result
@@ -257,15 +257,15 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `x'FF32'` varbinary(2) NOT NULL,
   `CONCAT(x'FF32')` varbinary(2) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 CALL test_inject(x'FF32');
 �2	CONCAT('�2')
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `�2` varchar(2) NOT NULL,
   `CONCAT('�2')` varchar(2) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 SELECT x'32FF', CONCAT(x'32FF') LIMIT 0;
 x'32FF'	CONCAT(x'32FF')
 CREATE TABLE t1 AS SELECT x'32FF', CONCAT(x'32FF');
@@ -274,15 +274,15 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `x'32FF'` varbinary(2) NOT NULL,
   `CONCAT(x'32FF')` varbinary(2) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 CALL test_inject(x'32FF');
 2�	CONCAT('2�')
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `2�` varchar(2) NOT NULL,
   `CONCAT('2�')` varchar(2) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 SELECT x'0032', CONCAT(x'0032') LIMIT 0;
 x'0032'	CONCAT(x'0032')
 CREATE TABLE t1 AS SELECT x'0032', CONCAT(x'0032');
@@ -291,15 +291,15 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `x'0032'` varbinary(2) NOT NULL,
   `CONCAT(x'0032')` varbinary(2) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 CALL test_inject(x'0032');
 2	CONCAT('\x002')
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `2` varchar(2) NOT NULL,
   `CONCAT('\x002')` varchar(2) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 SELECT x'3200', CONCAT(x'3200') LIMIT 0;
 x'3200'	CONCAT(x'3200')
 CREATE TABLE t1 AS SELECT x'3200', CONCAT(x'3200');
@@ -308,15 +308,15 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `x'3200'` varbinary(2) NOT NULL,
   `CONCAT(x'3200')` varbinary(2) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 CALL test_inject(x'3200');
 2\x00	CONCAT('2\x00')
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `2\x00` varchar(2) NOT NULL,
   `CONCAT('2\x00')` varchar(2) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 SELECT '0\a', CONCAT('0\a') LIMIT 0;
 0a	CONCAT('0\a')
 CREATE TABLE t1 AS SELECT '0\a', CONCAT('0\a');
@@ -325,15 +325,15 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `0a` varchar(2) NOT NULL,
   `CONCAT('0\a')` varchar(2) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 CALL test_inject('0\a');
 0a	CONCAT('0a')
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `0a` varchar(2) NOT NULL,
   `CONCAT('0a')` varchar(2) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 SELECT 'a\0', CONCAT('a\0') LIMIT 0;
 a\x00	CONCAT('a\0')
 CREATE TABLE t1 AS SELECT 'a\0', CONCAT('a\0');
@@ -342,15 +342,15 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a\x00` varchar(2) NOT NULL,
   `CONCAT('a\0')` varchar(2) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 CALL test_inject('a\0');
 a\x00	CONCAT('a\x00')
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a\x00` varchar(2) NOT NULL,
   `CONCAT('a\x00')` varchar(2) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 SELECT 'a\0b', CONCAT('a\0b') LIMIT 0;
 a\x00b	CONCAT('a\0b')
 CREATE TABLE t1 AS SELECT 'a\0b', CONCAT('a\0b');
@@ -359,15 +359,15 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a\x00b` varchar(3) NOT NULL,
   `CONCAT('a\0b')` varchar(3) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 CALL test_inject('a\0b');
 a\x00b	CONCAT('a\x00b')
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a\x00b` varchar(3) NOT NULL,
   `CONCAT('a\x00b')` varchar(3) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP PROCEDURE test_inject;
 #
 # MDEV-23519