Merge 10.3 into 10.4

CMakeLists.txt

@@ -15,6 +15,18 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335 USA
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
+
+IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  # Setting build type to RelWithDebInfo as none was specified.
+  # Must occur before PROJECT
+  SET(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
+   "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel"
+   FORCE)
+  # Set the possible values of build type for cmake-gui
+  SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+   "None" "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
+ENDIF()
+
 PROJECT(MySQL)
 
 IF(POLICY CMP0022)
@@ -42,17 +54,6 @@ IF(NOT DEFINED MANUFACTURER)
   MARK_AS_ADVANCED(MANUFACTURER)
 ENDIF()
 
-IF(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  # Setting build type to RelWithDebInfo as none was specified.")
-  SET(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
-   "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel"
-   FORCE)
-  # Set the possible values of build type for cmake-gui
-  SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-   "None" "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
-ENDIF()
-
-
 # MAX_INDEXES - Set the maximum number of indexes per table, default 64
 SET(MAX_INDEXES 64 CACHE STRING "Max number of indexes")
 IF (${MAX_INDEXES} GREATER 128)

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, 2019, MariaDB Corporation.
+# Copyright (c) 2011, 2021, 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
@@ -97,12 +97,14 @@ ELSEIF(RPM)
   SET(WITH_ZLIB system CACHE STRING "")
   SET(CHECKMODULE /usr/bin/checkmodule CACHE FILEPATH "")
   SET(SEMODULE_PACKAGE /usr/bin/semodule_package CACHE FILEPATH "")
+  SET(WITH_JEMALLOC "yes" CACHE STRING "")
   SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "")
 ELSEIF(DEB)
   SET(WITH_SSL system CACHE STRING "")
   SET(WITH_ZLIB system CACHE STRING "")
   SET(WITH_LIBWRAP ON)
   SET(HAVE_EMBEDDED_PRIVILEGE_CONTROL ON)
+  SET(WITH_JEMALLOC "yes" CACHE STRING "")
   SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "")
 ELSE()
   SET(WITH_SSL bundled CACHE STRING "")

mysql-test/lib/My/Debugger.pm

@@ -147,7 +147,7 @@ sub do_args($$$$$) {
   my %vars = (
     vardir => $::opt_vardir,
     exe => $$exe,
-    args => join(' ', map { quote_from_mtr $_ } @$$args, '--gdb'),
+    args => join(' ', map { quote_from_mtr $_ } @$$args, '--loose-gdb'),
     input => $input,
     script => "$::opt_vardir/tmp/${k}init.$type",
     log => "$::opt_vardir/log/$type.$k",
@@ -158,7 +158,7 @@ sub do_args($$$$$) {
 
   my $script = join "\n", @params;
   if ($v->{script}) {
-    ::mtr_tofile($vars{script}, subst($v->{script}, %vars)."\n".$script);
+    ::mtr_tonewfile($vars{script}, subst($v->{script}, %vars)."\n".$script);
   } elsif ($script) {
     die "$k is not using a script file, nowhere to write the script \n---\n$script\n---\n";
   }

mysql-test/main/auth_named_pipe.test

@@ -1,5 +1,10 @@
 --source include/windows.inc
 
+if (!$AUTH_NAMED_PIPE_SO)
+{
+  skip No auth_named_pipe plugin;
+}
+
 INSTALL SONAME 'auth_named_pipe';
 
 --replace_result $USERNAME USERNAME

mysql-test/main/xa.result

@@ -371,6 +371,32 @@ XA ROLLBACK 'xid';
 DROP TABLE t1;
 disconnect con1;
 connection default;
+#
+# XA states and SHOW commands
+#
+create table t1 (pk int primary key) engine=innodb;
+xa start 'foo';
+insert t1 set pk=1;
+xa end 'foo';
+xa prepare 'foo';
+show status like 'foo';
+Variable_name	Value
+select table_name,table_comment from information_schema.tables where table_schema='test';
+table_name	t1
+table_comment	
+select table_name,table_rows,table_comment from information_schema.tables where table_schema='test';
+table_name	t1
+table_rows	NULL
+table_comment	XAER_RMFAIL: The command cannot be executed when global transaction is in the  PREPARED state
+Warnings:
+Level	Warning
+Code	1399
+Message	XAER_RMFAIL: The command cannot be executed when global transaction is in the  PREPARED state
+xa commit 'foo';
+drop table t1;
+#
+# End of 10.2 tests
+#
 XA BEGIN 'xid';
 CREATE TEMPORARY SEQUENCE s;
 ERROR XAE07: XAER_RMFAIL: The command cannot be executed when global transaction is in the  ACTIVE state

mysql-test/main/xa.test

@@ -517,6 +517,24 @@ connection default;
 
 --source include/wait_until_count_sessions.inc
 
+--echo #
+--echo # XA states and SHOW commands
+--echo #
+create table t1 (pk int primary key) engine=innodb;
+xa start 'foo';
+insert t1 set pk=1;
+xa end 'foo';
+xa prepare 'foo';
+show status like 'foo';
+--query_vertical select table_name,table_comment from information_schema.tables where table_schema='test'
+--query_vertical select table_name,table_rows,table_comment from information_schema.tables where table_schema='test'
+xa commit 'foo';
+drop table t1;
+
+--echo #
+--echo # End of 10.2 tests
+--echo #
+
 #
 # MDEV-22002 Assertion `!is_set() || (m_status == DA_OK_BULK && is_bulk_op())'
 # failed upon CREATE TEMPORARY SEQUENCE under XA

mysql-test/suite/galera/disabled.def

@@ -27,7 +27,7 @@ galera_gcache_recover_manytrx : MDEV-18834 Galera test failure
 galera_kill_largechanges : MDEV-18179 Galera test failure on galera.galera_kill_largechanges
 galera_many_tables_nopk : MDEV-18182 Galera test failure on galera.galera_many_tables_nopk
 galera_mdl_race : MDEV-21524 galera.galera_mdl_race
-galera_parallel_simple : MDEV-20318 galera.galera_parallel_simple fails	
+galera_parallel_simple : MDEV-20318 galera.galera_parallel_simple fails
 galera_pc_ignore_sb : MDEV-20888 galera.galera_pc_ignore_sb
 galera_pc_recovery : MDEV-25199 cluster fails to start up
 galera_shutdown_nonprim : MDEV-21493 galera.galera_shutdown_nonprim

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

@@ -1,3 +1,5 @@
+connection node_2;
+connection node_1;
 CREATE TABLE t1(id int not null primary key, b int) engine=InnoDB;
 INSERT INTO t1 VALUES (0,0),(1,1),(2,2),(3,3);
 BEGIN;

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

@@ -1,17 +1,18 @@
-call mtr.add_suppression("WSREP: write_handler(): protocol is shutdown");
-SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';
-VARIABLE_VALUE = 'Synced'
-1
-SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-VARIABLE_VALUE = 2
-1
 connection node_1;
 call mtr.add_suppression("WSREP: write_handler(): protocol is shutdown.*");
 connection node_2;
 call mtr.add_suppression("WSREP: write_handler(): protocol is shutdown.*");
 connection node_1;
 connection node_2;
 connection node_1;
+connection node_2;
+SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';
+VARIABLE_VALUE = 'Synced'
+1
+SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+VARIABLE_VALUE = 2
+1
+connection node_1;
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 2
 1
@@ -23,3 +24,5 @@ connection node_1;
 SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 2
 1
+disconnect node_2;
+disconnect node_1;

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

@@ -3,3 +3,4 @@ connection node_1;
 SELECT 1;
 1
 1
+include/assert_grep.inc [Using openssl based encryption with socat]

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

@@ -0,0 +1,4 @@
+SELECT 1;
+1
+1
+include/assert_grep.inc [Using openssl based encryption with socat]