Merge 10.7 into 10.8

MariaDB · Sep 21, 2022 · 4345d93 · 4345d93
2 parents 90d899c + 7c7ac6d
commit 4345d93
Show file tree

Hide file tree

Showing 1,213 changed files with 31,078 additions and 30,257 deletions.
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
@@ -107,10 +107,10 @@ ELSEIF(RPM)
   SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "")
   SET(WITH_PCRE system CACHE STRING "")
   SET(CLIENT_PLUGIN_ZSTD OFF)
-  IF(RPM MATCHES "fedora|centos|rhel")
+  IF(RPM MATCHES "fedora|centos|rhel|rocky|alma")
     SET(WITH_ROCKSDB_BZip2 OFF CACHE STRING "")
   ENDIF()
-  IF(RPM MATCHES "opensuse|sles|centos|rhel")
+  IF(RPM MATCHES "opensuse|sles|centos|rhel|rocky|alma")
     SET(WITH_ROCKSDB_LZ4 OFF CACHE STRING "")
   ENDIF()
 ELSEIF(DEB)

diff --git a/extra/mariabackup/changed_page_bitmap.cc b/extra/mariabackup/changed_page_bitmap.cc
@@ -455,7 +455,7 @@ log_online_open_bitmap_file_read_only(
 	bitmap_file->size = os_file_get_size(bitmap_file->file);
 	bitmap_file->offset = 0;
 
-#ifdef UNIV_LINUX
+#ifdef __linux__
 	posix_fadvise(bitmap_file->file, 0, 0, POSIX_FADV_SEQUENTIAL);
 	posix_fadvise(bitmap_file->file, 0, 0, POSIX_FADV_NOREUSE);
 #endif

diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
@@ -2479,7 +2479,8 @@ xb_read_delta_metadata(const char *filepath, xb_delta_info_t *info)
 		msg("page_size is required in %s", filepath);
 		r = FALSE;
 	} else {
-		info->page_size = zip_size ? zip_size : page_size;
+		info->page_size = page_size;
+		info->zip_size = zip_size;
 	}
 
 	if (info->space_id == UINT32_MAX) {

diff --git a/include/my_global.h b/include/my_global.h
@@ -1061,10 +1061,12 @@ typedef ulong		myf;	/* Type of MyFlags in my_funcs */
 static inline char *dlerror(void)
 {
   static char win_errormsg[2048];
-  FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM
-      | FORMAT_MESSAGE_IGNORE_INSERTS
-      | FORMAT_MESSAGE_MAX_WIDTH_MASK,
-    0, GetLastError(), 0, win_errormsg, 2048, NULL);
+  FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |
+                 FORMAT_MESSAGE_IGNORE_INSERTS |
+                 FORMAT_MESSAGE_MAX_WIDTH_MASK,
+                 0, GetLastError(),
+                 MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
+                 win_errormsg, 2048, NULL);
   return win_errormsg;
 }
 #define HAVE_DLOPEN 1

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