Merge 10.4 into 10.5

MariaDB · Feb 10, 2023 · c41c796 · c41c796
2 parents a9eb272 + cacea31
commit c41c796
Show file tree

Hide file tree

Showing 277 changed files with 2,048 additions and 1,500 deletions.
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
@@ -312,8 +312,8 @@ class Load_log_processor
     }
 
 public:
-  Load_log_processor() {}
-  ~Load_log_processor() {}
+  Load_log_processor() = default;
+  ~Load_log_processor() = default;
 
   int init()
   {

diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
@@ -1864,6 +1864,17 @@ xb_get_one_option(const struct my_option *opt,
     break;
 
   case OPT_INNODB_FLUSH_METHOD:
+#ifdef _WIN32
+    /* From: storage/innobase/handler/ha_innodb.cc:innodb_init_params */
+    switch (srv_file_flush_method) {
+    case SRV_ALL_O_DIRECT_FSYNC + 1 /* "async_unbuffered"="unbuffered" */:
+      srv_file_flush_method= SRV_ALL_O_DIRECT_FSYNC;
+      break;
+    case SRV_ALL_O_DIRECT_FSYNC + 2 /* "normal"="fsync" */:
+      srv_file_flush_method= SRV_FSYNC;
+      break;
+    }
+#endif
     ut_a(srv_file_flush_method
 	 <= IF_WIN(SRV_ALL_O_DIRECT_FSYNC, SRV_O_DIRECT_NO_FSYNC));
     ADD_PRINT_PARAM_OPT(innodb_flush_method_names[srv_file_flush_method]);

diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt
@@ -12,6 +12,9 @@ IF(MSVC)
   SET(WOLFSSL_X86_64_BUILD 1)
   SET(HAVE_INTEL_RDSEED 1)
   SET(HAVE_INTEL_RDRAND 1)
+ELSEIF(CMAKE_ASM_COMPILER_ID MATCHES "Clang" AND CMAKE_VERSION VERSION_LESS 3.16)
+
+  # WolfSSL 5.5.4 bug workaround below does not work, due to some CMake bug
 ELSEIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64")
   SET(WOLFSSL_X86_64_BUILD 1)
   IF(CMAKE_C_COMPILER_ID MATCHES GNU  AND CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)

diff --git a/include/ilist.h b/include/ilist.h
@@ -27,12 +27,11 @@
 // Derive your class from this struct to insert to a linked list.
 template <class Tag= void> struct ilist_node
 {
-  ilist_node() noexcept
 #ifndef DBUG_OFF
-      : next(NULL), prev(NULL)
+  ilist_node() noexcept : next(NULL), prev(NULL) {}
+#else
+  ilist_node() = default;
 #endif
-  {
-  }
 
   ilist_node(ilist_node *next, ilist_node *prev) noexcept
       : next(next), prev(prev)

diff --git a/include/my_atomic_wrapper.h b/include/my_atomic_wrapper.h
@@ -39,7 +39,7 @@ template <typename Type> class Atomic_relaxed
   Atomic_relaxed(const Atomic_relaxed<Type> &rhs)
   { m.store(rhs, std::memory_order_relaxed); }
   Atomic_relaxed(Type val) : m(val) {}
-  Atomic_relaxed() {}
+  Atomic_relaxed() = default;
 
   Type load(std::memory_order o= std::memory_order_relaxed) const
   { return m.load(o); }

diff --git a/include/my_counter.h b/include/my_counter.h
@@ -31,7 +31,7 @@ template <typename Type> class Atomic_counter
   Atomic_counter(const Atomic_counter<Type> &rhs)
   { m_counter.store(rhs, std::memory_order_relaxed); }
   Atomic_counter(Type val): m_counter(val) {}
-  Atomic_counter() {}
+  Atomic_counter() = default;
 
   Type operator++(int) { return add(1); }
   Type operator--(int) { return sub(1); }

diff --git a/include/span.h b/include/span.h
@@ -81,7 +81,7 @@ template <class ElementType> class span
 
   span(const span &other) : data_(other.data_), size_(other.size_) {}
 
-  ~span(){};
+  ~span() = default;
 
   span &operator=(const span &other)
   {

diff --git a/mysql-test/include/ctype_casefolding.inc b/mysql-test/include/ctype_casefolding.inc
@@ -0,0 +1,18 @@
+CREATE OR REPLACE TABLE case_folding AS SELECT 0 AS code, SPACE(32) AS c LIMIT 0;
+SHOW CREATE TABLE case_folding;
+# Uncode code points that have a variable length case mapping in utf8
+# (e.g.  LOWER('2-byte-character') -> '3-byte-character'
+INSERT INTO case_folding (code) VALUES
+(0x23A),
+(0x23E),
+(0x23F),
+(0x240),
+(0x250),
+(0x251),
+(0x252),
+(0x26B),
+(0x271),
+(0x27D);
+UPDATE case_folding SET c=CHAR(code USING ucs2);
+SELECT HEX(code), HEX(LOWER(c)), HEX(UPPER(c)), c FROM case_folding;
+DROP TABLE case_folding;
diff --git a/mysql-test/main/ctype_ldml.result b/mysql-test/main/ctype_ldml.result
@@ -3036,9 +3036,57 @@ SELECT 'chž'< 'i';
 SELECT 'a' COLLATE utf8_czech_test_bad_w2;
 ERROR HY000: Unknown collation: 'utf8_czech_test_bad_w2'
 #
+# End of 10.2 tests
+#
+#
+# Start of 10.3 tests
+#
+#
+# MDEV-30556 UPPER() returns an empty string for U+0251 in Unicode-5.2.0+ collations for utf8
+#
+SET NAMES utf8mb4 COLLATE utf8mb4_test_520_nopad_ci;
+CREATE OR REPLACE TABLE case_folding AS SELECT 0 AS code, SPACE(32) AS c LIMIT 0;
+SHOW CREATE TABLE case_folding;
+Table	Create Table
+case_folding	CREATE TABLE `case_folding` (
+  `code` int(1) NOT NULL,
+  `c` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_test_520_nopad_ci DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
+INSERT INTO case_folding (code) VALUES
+(0x23A),
+(0x23E),
+(0x23F),
+(0x240),
+(0x250),
+(0x251),
+(0x252),
+(0x26B),
+(0x271),
+(0x27D);
+UPDATE case_folding SET c=CHAR(code USING ucs2);
+SELECT HEX(code), HEX(LOWER(c)), HEX(UPPER(c)), c FROM case_folding;
+HEX(code)	HEX(LOWER(c))	HEX(UPPER(c))	c
+23A	E2B1A5	C8BA	Ⱥ
+23E	E2B1A6	C8BE	Ⱦ
+23F	C8BF	E2B1BE	ȿ
+240	C980	E2B1BF	ɀ
+250	C990	E2B1AF	ɐ
+251	C991	E2B1AD	ɑ
+252	C992	E2B1B0	ɒ
+26B	C9AB	E2B1A2	ɫ
+271	C9B1	E2B1AE	ɱ
+27D	C9BD	E2B1A4	ɽ
+DROP TABLE case_folding;
+#
+# End of 10.3 tests
+#
+#
 # MDEV-7947 my_charset_same: strcmp() takes 0.37% in OLTP RO
 #
 SHOW COLLATION LIKE 'latin1_test_replace';
 Collation	Charset	Id	Default	Compiled	Sortlen
 SELECT 'foo' = 'foo ' COLLATE latin1_test_replace;
 ERROR HY000: Unknown collation: 'latin1_test_replace'
+#
+# End of 10.5 tests
+#
diff --git a/mysql-test/main/ctype_ldml.test b/mysql-test/main/ctype_ldml.test
@@ -610,6 +610,27 @@ SELECT 'chž'< 'i';
 --error ER_UNKNOWN_COLLATION
 SELECT 'a' COLLATE utf8_czech_test_bad_w2;
 
+--echo #
+--echo # End of 10.2 tests
+--echo #
+
+
+--echo #
+--echo # Start of 10.3 tests
+--echo #
+
+--echo #
+--echo # MDEV-30556 UPPER() returns an empty string for U+0251 in Unicode-5.2.0+ collations for utf8
+--echo #
+
+SET NAMES utf8mb4 COLLATE utf8mb4_test_520_nopad_ci;
+--source include/ctype_casefolding.inc
+
+
+--echo #
+--echo # End of 10.3 tests
+--echo #
+
 
 --echo #
 --echo # MDEV-7947 my_charset_same: strcmp() takes 0.37% in OLTP RO
@@ -618,3 +639,7 @@ SELECT 'a' COLLATE utf8_czech_test_bad_w2;
 SHOW COLLATION LIKE 'latin1_test_replace';
 --error ER_UNKNOWN_COLLATION
 SELECT 'foo' = 'foo ' COLLATE latin1_test_replace;
+
+--echo #
+--echo # End of 10.5 tests
+--echo #
diff --git a/mysql-test/main/ctype_uca.result b/mysql-test/main/ctype_uca.result
@@ -8204,7 +8204,7 @@ INSERT INTO t1 VALUES (_utf32 0x2CEE);
 SELECT hex(c), hex(lower(c)), hex(upper(c)), hex(weight_string(c)), c
 FROM t1 ORDER BY c, BINARY c;
 hex(c)	hex(lower(c))	hex(upper(c))	hex(weight_string(c))	c
-C8BA		C8BA	1214	Ⱥ
+C8BA	E2B1A5	C8BA	1214	Ⱥ
 E2B1A5	E2B1A5	C8BA	1214	ⱥ
 C680	C680	C983	122D	ƀ
 C983	C680	C983	122D	Ƀ
@@ -8229,19 +8229,19 @@ E2B1AA	E2B1AA	E2B1A9	1328	ⱪ
 C8BD	C69A	C8BD	133B	Ƚ
 E2B1A0	E2B1A1	E2B1A0	133F	Ⱡ
 E2B1A1	E2B1A1	E2B1A0	133F	ⱡ
-C9AB	C9AB		1340	ɫ
+C9AB	C9AB	E2B1A2	1340	ɫ
 E2B1A2	C9AB	E2B1A2	1340	Ɫ
 E1B5BD	E1B5BD	E2B1A3	13B8	ᵽ
 E2B1A3	E1B5BD	E2B1A3	13B8	Ᵽ
 C98A	C98B	C98A	13D2	Ɋ
 C98B	C98B	C98A	13D2	ɋ
 C98C	C98D	C98C	13E4	Ɍ
 C98D	C98D	C98C	13E4	ɍ
-C9BD	C9BD		13FC	ɽ
+C9BD	C9BD	E2B1A4	13FC	ɽ
 E2B1A4	C9BD	E2B1A4	13FC	Ɽ
 EA9CA8	EA9CA9	EA9CA8	143314AD	Ꜩ
 EA9CA9	EA9CA9	EA9CA8	143314AD	ꜩ
-C8BE		C8BE	143C	Ⱦ
+C8BE	E2B1A6	C8BE	143C	Ⱦ
 E2B1A6	E2B1A6	C8BE	143C	ⱦ
 C984	CA89	C984	145B	Ʉ
 CA89	CA89	C984	145B	ʉ