Merge 10.4 into 10.5

cmake/build_configurations/mysql_release.cmake

@@ -1,5 +1,5 @@
 # Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-# Copyright (c) 2011, 2021, MariaDB Corporation.
+# Copyright (c) 2011, 2022, MariaDB Corporation.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -107,12 +107,12 @@ ELSEIF(RPM)
   SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "")
   SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "")
   SET(WITH_PCRE system CACHE STRING "")
-  IF(RPM MATCHES "fedora|centos|rhel")
+  IF(RPM MATCHES "fedora|centos|rhel|rocky|alma")
     SET(WITH_INNODB_BZIP2 OFF CACHE STRING "")
     SET(WITH_INNODB_LZO OFF CACHE STRING "")
     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_INNODB_LZ4 OFF CACHE STRING "")
     SET(WITH_ROCKSDB_LZ4 OFF CACHE STRING "")
     SET(GRN_WITH_LZ4 no CACHE STRING "")

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

include/my_global.h

@@ -1050,7 +1050,7 @@ static inline char *dlerror(void)
 {
   static char win_errormsg[2048];
   FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM,
-    0, GetLastError(), 0, win_errormsg, 2048, NULL);
+    0, GetLastError(),  MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), win_errormsg, 2048, NULL);
   return win_errormsg;
 }
 #define HAVE_DLOPEN 1

mysql-test/main/binary_to_hex.result

@@ -21,7 +21,7 @@ t1	CREATE TABLE `t1` (
   `c7` binary(1) DEFAULT NULL,
   `c8` varbinary(10) DEFAULT NULL,
   `c9` geometry DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=binary COLLATE=binary
+) ENGINE=MyISAM DEFAULT CHARSET=binary
 INSERT INTO t1 VALUES ('tinyblob-text readable', 'blob-text readable',
 'mediumblob-text readable', 'longblob-text readable',
 'text readable', b'1', 'c', 'variable',

mysql-test/main/ctype_binary.result

@@ -3171,7 +3171,7 @@ CREATE TABLE t1(a ENUM(0x6100,0x6200,0x6300) CHARACTER SET 'Binary');
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` enum('a\0','b\0','c\0') CHARACTER SET binary COLLATE binary DEFAULT NULL
+  `a` enum('a\0','b\0','c\0') CHARACTER SET binary DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 VALUES (1),(2),(3);
 SELECT HEX(a) FROM t1 ORDER BY a;
@@ -3269,7 +3269,7 @@ CREATE TABLE t1(c ENUM(0x0061) CHARACTER SET 'Binary', d JSON);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` enum('\0a') CHARACTER SET binary COLLATE binary DEFAULT NULL,
+  `c` enum('\0a') CHARACTER SET binary DEFAULT NULL,
   `d` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`d`))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (c) VALUES (1);
@@ -3284,7 +3284,7 @@ d INT DEFAULT NULL CHECK (d>0)
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` enum('\0a') CHARACTER SET binary COLLATE binary DEFAULT NULL,
+  `c` enum('\0a') CHARACTER SET binary DEFAULT NULL,
   `d` int(11) DEFAULT NULL CHECK (`d` > 0)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 VALUES (1,1);
@@ -3296,7 +3296,7 @@ CREATE TABLE t1(c ENUM(0x0061) CHARACTER SET 'Binary' CHECK (c>0));
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` enum('\0a') CHARACTER SET binary COLLATE binary DEFAULT NULL CHECK (`c` > 0)
+  `c` enum('\0a') CHARACTER SET binary DEFAULT NULL CHECK (`c` > 0)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 VALUES (1);
 SELECT HEX(c) FROM t1;
@@ -3307,6 +3307,50 @@ DROP TABLE t1;
 # End of 10.2 tests
 #
 #
+# Start of 10.3 tests
+#
+#
+# MDEV-29561 SHOW CREATE TABLE produces syntactically incorrect structure
+#
+CREATE TABLE t1 (a ENUM('x') CHARACTER SET BINARY);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` enum('x') CHARACTER SET binary DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+DROP TABLE t1;
+CREATE TABLE `t1` (
+  `a` enum('x') CHARACTER SET binary DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci;
+DROP TABLE t1;
+CREATE TABLE t1 (a INT ) CHARSET=binary;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=binary
+DROP TABLE t1;
+CREATE DATABASE db1 CHARACTER SET BINARY;
+SHOW CREATE DATABASE db1;
+Database	Create Database
+db1	CREATE DATABASE `db1` /*!40100 DEFAULT CHARACTER SET binary */
+DROP DATABASE db1;
+CREATE FUNCTION f1() RETURNS ENUM('a') CHARACTER SET binary RETURN NULL;
+SHOW CREATE FUNCTION f1;
+Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
+f1	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS enum('a') CHARSET binary
+RETURN NULL	latin1	latin1_swedish_ci	latin1_swedish_ci
+DROP FUNCTION f1;
+CREATE FUNCTION f1(a ENUM('a') CHARACTER SET binary) RETURNS INT RETURN NULL;
+SHOW CREATE FUNCTION f1;
+Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
+f1	STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` FUNCTION `f1`(a ENUM('a') CHARACTER SET binary) RETURNS int(11)
+RETURN NULL	latin1	latin1_swedish_ci	latin1_swedish_ci
+DROP FUNCTION f1;
+#
+# End of 10.3 tests
+#
+#
 # Start of 10.5 tests
 #
 #

mysql-test/main/ctype_binary.test

@@ -157,6 +157,42 @@ DROP TABLE t1;
 --echo # End of 10.2 tests
 --echo #
 
+
+--echo #
+--echo # Start of 10.3 tests
+--echo #
+
+--echo #
+--echo # MDEV-29561 SHOW CREATE TABLE produces syntactically incorrect structure
+--echo #
+
+CREATE TABLE t1 (a ENUM('x') CHARACTER SET BINARY);
+SHOW CREATE TABLE t1;
+let $def= query_get_value(show create table t1,'Create Table',1);
+DROP TABLE t1;
+eval $def;
+DROP TABLE t1;
+
+CREATE TABLE t1 (a INT ) CHARSET=binary;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+CREATE DATABASE db1 CHARACTER SET BINARY;
+SHOW CREATE DATABASE db1;
+DROP DATABASE db1;
+
+CREATE FUNCTION f1() RETURNS ENUM('a') CHARACTER SET binary RETURN NULL;
+SHOW CREATE FUNCTION f1;
+DROP FUNCTION f1;
+
+CREATE FUNCTION f1(a ENUM('a') CHARACTER SET binary) RETURNS INT RETURN NULL;
+SHOW CREATE FUNCTION f1;
+DROP FUNCTION f1;
+
+--echo #
+--echo # End of 10.3 tests
+--echo #
+
 --echo #
 --echo # Start of 10.5 tests
 --echo #

mysql-test/main/ctype_utf16_uca.result

@@ -7907,7 +7907,7 @@ CREATE TABLE t1(c ENUM('aaaaaaaa') CHARACTER SET 'Binary',d JSON);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` enum('\0a\0a\0a\0a\0a\0a\0a\0a') CHARACTER SET binary COLLATE binary DEFAULT NULL,
+  `c` enum('\0a\0a\0a\0a\0a\0a\0a\0a') CHARACTER SET binary DEFAULT NULL,
   `d` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`d`))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (c) VALUES (1);
@@ -7919,7 +7919,7 @@ CREATE OR REPLACE TABLE t1(c ENUM('aaaaaaaaa') CHARACTER SET 'Binary',d JSON);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` enum('\0a\0a\0a\0a\0a\0a\0a\0a\0a') CHARACTER SET binary COLLATE binary DEFAULT NULL,
+  `c` enum('\0a\0a\0a\0a\0a\0a\0a\0a\0a') CHARACTER SET binary DEFAULT NULL,
   `d` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`d`))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (c) VALUES (1);
@@ -7931,7 +7931,7 @@ CREATE OR REPLACE TABLE t1(c ENUM('aaaaaaaaaa') CHARACTER SET 'Binary',d JSON);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c` enum('\0a\0a\0a\0a\0a\0a\0a\0a\0a\0a') CHARACTER SET binary COLLATE binary DEFAULT NULL,
+  `c` enum('\0a\0a\0a\0a\0a\0a\0a\0a\0a\0a') CHARACTER SET binary DEFAULT NULL,
   `d` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`d`))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (c) VALUES (1);

mysql-test/main/ctype_utf32.result

@@ -2878,7 +2878,7 @@ CREATE TABLE t1(c1 ENUM('a','b','ac') CHARACTER SET 'Binary',c2 JSON,c3 INT);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` enum('\0\0\0a','\0\0\0b','\0\0\0a\0\0\0c') CHARACTER SET binary COLLATE binary DEFAULT NULL,
+  `c1` enum('\0\0\0a','\0\0\0b','\0\0\0a\0\0\0c') CHARACTER SET binary DEFAULT NULL,
   `c2` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`c2`)),
   `c3` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci

mysql-test/main/ctype_utf32_uca.result

@@ -7969,7 +7969,7 @@ CREATE TABLE t1(c1 SET('a') COLLATE 'Binary',c2 JSON);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `c1` set('\0\0\0a') CHARACTER SET binary COLLATE binary DEFAULT NULL,
+  `c1` set('\0\0\0a') CHARACTER SET binary DEFAULT NULL,
   `c2` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`c2`))
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;

mysql-test/suite/galera/r/galera_toi_ddl_error.result

@@ -12,13 +12,13 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `f1` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 connection node_1;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `f1` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 DROP TABLE ten;
 CALL mtr.add_suppression("Ignoring error 'Duplicate entry '111110' for key 'PRIMARY'' on query.");

mysql-test/suite/innodb/r/innodb-system-table-view.result

@@ -181,3 +181,10 @@ test/parent	1	2
 DROP TABLE child;
 DROP TABLE parent;
 SET GLOBAL innodb_purge_rseg_truncate_frequency=@save_frequency;
+#
+# MDEV-29479  I_S.INNODB_SYS_TABLESPACES doesn't have
+#		temporary tablespace information
+#
+SELECT SPACE FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES WHERE name like 'innodb_temporary';
+SPACE
+4294967294

mysql-test/suite/innodb/t/innodb-system-table-view.test

@@ -141,3 +141,9 @@ DROP TABLE child;
 
 DROP TABLE parent;
 SET GLOBAL innodb_purge_rseg_truncate_frequency=@save_frequency;
+
+--echo #
+--echo # MDEV-29479  I_S.INNODB_SYS_TABLESPACES doesn't have
+--echo #		temporary tablespace information
+--echo #
+SELECT SPACE FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES WHERE name like 'innodb_temporary';