Merge 10.6 into 10.7

Author: dr-m

cmake/plugin.cmake

@@ -30,13 +30,13 @@ INCLUDE(CMakeParseArguments)
 # [CONFIG cnf_file_name]
 # [VERSION version_string]
 # [LINK_LIBRARIES lib1...libN]
-# [DEPENDENCIES target1...targetN]
+# [DEPENDS target1...targetN]
 
 MACRO(MYSQL_ADD_PLUGIN)
  CMAKE_PARSE_ARGUMENTS(ARG
  "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_EMBEDDED;RECOMPILE_FOR_EMBEDDED;CLIENT"
  "MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME;COMPONENT;CONFIG;VERSION"
- "LINK_LIBRARIES;DEPENDENCIES"
+ "LINK_LIBRARIES;DEPENDS"
  ${ARGN}
  )
  IF(NOT WITHOUT_SERVER OR ARG_CLIENT)
@@ -115,8 +115,8 @@ MACRO(MYSQL_ADD_PLUGIN)
  ENDIF()
  UNSET(${with_var} CACHE)
 
- IF(NOT ARG_DEPENDENCIES)
- SET(ARG_DEPENDENCIES)
+ IF(NOT ARG_DEPENDS)
+ SET(ARG_DEPENDS)
  ENDIF()
 
  IF(ARG_VERSION)
@@ -146,7 +146,7 @@ MACRO(MYSQL_ADD_PLUGIN)
 
  ADD_LIBRARY(${target} STATIC ${SOURCES})
  DTRACE_INSTRUMENT(${target})
- ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES})
+ ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDS})
  RESTRICT_SYMBOL_EXPORTS(${target})
  IF(WITH_EMBEDDED_SERVER AND (NOT ARG_NOT_EMBEDDED))
  # Embedded library should contain PIC code and be linkable
@@ -160,7 +160,7 @@ MACRO(MYSQL_ADD_PLUGIN)
  SET_TARGET_PROPERTIES(${target}_embedded 
  PROPERTIES COMPILE_DEFINITIONS "EMBEDDED_LIBRARY${version_string}")
  ENDIF()
- ADD_DEPENDENCIES(${target}_embedded GenError)
+ ADD_DEPENDENCIES(${target}_embedded GenError ${ARG_DEPENDS})
  ENDIF()
  ENDIF()
 
@@ -235,7 +235,7 @@ MACRO(MYSQL_ADD_PLUGIN)
  TARGET_LINK_LIBRARIES (${target} "-Wl,--no-undefined")
  ENDIF()
 
- ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES})
+ ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDS})
 
  SET_TARGET_PROPERTIES(${target} PROPERTIES 
  OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}") 

debian/autobake-deb.sh

@@ -17,29 +17,17 @@ set -e
 # building the deb packages here.
 export DEB_BUILD_OPTIONS="nocheck $DEB_BUILD_OPTIONS"
 
-# Take the files and part of control from MCS directory
-if [[ -d storage/columnstore/columnstore/debian ]]
-then
- cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
- echo >> debian/control
- cat storage/columnstore/columnstore/debian/control >> debian/control
-
- # ColumnStore is explicitly disabled in the native build, so allow it now
- # when build it when triggered by autobake-deb.sh
- sed '/-DPLUGIN_COLUMNSTORE=NO/d' -i debian/rules
-fi
-
 # General CI optimizations to keep build output smaller
 if [[ $TRAVIS ]] || [[ $GITLAB_CI ]]
 then
  # On both Travis and Gitlab the output log must stay under 4MB so make the
  # build less verbose
- sed '/Add support for verbose builds/,/^$/d' -i debian/rules
-
  # MCOL-4149: ColumnStore builds are so slow and big that they must be skipped on
  # both Travis-CI and Gitlab-CI
- sed 's|$(CMAKEFLAGS)|$(CMAKEFLAGS) -DPLUGIN_COLUMNSTORE=NO|' -i debian/rules
- sed "/Package: mariadb-plugin-columnstore/,/^$/d" -i debian/control
+ sed -e '/Add support for verbose builds/,/^$/d' \
+ -e '/ColumnStore is part of the build/,/^$/d' \
+ -e 's|$(CMAKEFLAGS)|$(CMAKEFLAGS) -DPLUGIN_COLUMNSTORE=NO|' \
+ -i debian/rules
 fi
 
 # Don't build or try to put files in a package for selected plugins and components on Travis-CI

debian/rules

@@ -38,11 +38,6 @@ else
  NUMJOBS = 1
 endif
 
-# RocksDB cannot build on 32-bit platforms
-ifeq (32,$(DEB_HOST_ARCH_BITS))
- CMAKEFLAGS += -DPLUGIN_ROCKSDB=NO
-endif
-
 # Cross building requires stack direction instruction
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
  ifneq (,$(filter $(DEB_HOST_ARCH_CPU),alpha amd64 arm arm64 i386 ia64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64))
@@ -59,14 +54,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH_CPU),amd64 arm64 ppc64el))
 CMAKEFLAGS += -DWITH_PMEM=yes
 endif
 
-# Add extra flag to avoid WolfSSL code crashing the entire mariadbd on s390x. This
-# can be removed once upstream has made the code s390x compatible, see
-# https://jira.mariadb.org/browse/MDEV-21705 and
-# https://github.com/wolfSSL/wolfssl/issues/2828
-ifeq ($(DEB_HOST_ARCH),s390x)
- CFLAGS += -DWC_NO_CACHE_RESISTANT
-endif
-
 # Add support for verbose builds
 MAKEFLAGS += VERBOSE=1
 
@@ -85,15 +72,25 @@ ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_configure --builddirectory=builddir-native
 dh_auto_build --builddirectory=builddir-native -- import_executables
 endif
+
+# ColumnStore is part of the build
+ifneq (32,$(DEB_HOST_ARCH_BITS))
+# Take the files and part of control from MCS directory
+cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
+# Don't include twice
+grep -q '^Package: mariadb-plugin-columnstore$$' debian/control || \
+( echo && cat storage/columnstore/columnstore/debian/control ) >> debian/control
+endif
+
 echo "server:Version=$(DEB_VERSION)" >> debian/substvars
 
-# Don't build ColumnStore as part of the native build, only build it when
-# triggered by autobake-deb.sh. Saves build time and disk space.
+# RocksDB and Column Store cannot build on 32-bit platforms
 PATH=$${MYSQL_BUILD_PATH:-"/usr/lib/ccache:/usr/local/bin:/usr/bin:/bin"} \
  NO_UPDATE_BUILD_VERSION=1 \
  dh_auto_configure --builddirectory=$(BUILDDIR) -- \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  $(CMAKEFLAGS) \
+ $(if $(findstring $(DEB_HOST_ARCH_BITS),32),-DPLUGIN_ROCKSDB=NO -DPLUGIN_COLUMNSTORE=NO) \
  $(if $(filter $(DEB_BUILD_ARCH),$(DEB_HOST_ARCH)),,-DIMPORT_EXECUTABLES=$(CURDIR)/builddir-native/import_executables.cmake) \
  -DCOMPILATION_COMMENT="mariadb.org binary distribution" \
  -DMYSQL_SERVER_SUFFIX="-$(DEB_VERSION_REVISION)" \
@@ -102,7 +99,6 @@ endif
  -DBUILD_CONFIG=mysql_release \
  -DCONC_DEFAULT_CHARSET=utf8mb4 \
  -DPLUGIN_AWS_KEY_MANAGEMENT=NO \
- -DPLUGIN_COLUMNSTORE=NO \
  -DIGNORE_AIO_CHECK=YES \
  -DWITH_URING=yes \
  -DDEB=$(DEB_VENDOR)

extra/mariabackup/xtrabackup.cc

@@ -3451,7 +3451,7 @@ os_file_readdir_next_file(
 if (err == ERROR_NO_MORE_FILES) {
 status = 1;
 } else {
-msg("readdir_next_file in %s returned %lu", dir, err);
+msg("FindNextFile in %s returned %lu", dirname, err);
 status = -1;
 }
 }

mysql-test/suite/binlog/r/binlog_truncate_active_log.result

@@ -1,6 +1,7 @@
 call mtr.add_suppression("Can.t init tc log");
 call mtr.add_suppression("Aborting");
 RESET MASTER;
+SET @@global.sync_binlog=1;
 CREATE TABLE t (f INT) ENGINE=INNODB;
 CREATE TABLE t2 (f INT) ENGINE=INNODB;
 CREATE TABLE tm (f INT) ENGINE=Aria;
@@ -28,7 +29,7 @@ connection default;
 disconnect master1;
 disconnect master2;
 disconnect master3;
-# restart: --rpl-semi-sync-slave-enabled=1
+# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
 FOUND 1 /Successfully truncated.*to remove transactions starting from GTID 0-1-6/ in mysqld.1.err
 Pre-crash binlog file content:
 include/show_binlog_events.inc
@@ -77,7 +78,7 @@ connection default;
 disconnect master1;
 disconnect master2;
 disconnect master3;
-# restart: --rpl-semi-sync-slave-enabled=1
+# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
 FOUND 1 /Successfully truncated.*to remove transactions starting from GTID 0-1-10/ in mysqld.1.err
 Pre-crash binlog file content:
 include/show_binlog_events.inc
@@ -133,7 +134,7 @@ connection default;
 disconnect master1;
 disconnect master2;
 disconnect master3;
-# restart: --rpl-semi-sync-slave-enabled=1
+# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
 FOUND 1 /Successfully truncated.*to remove transactions starting from GTID 0-1-14/ in mysqld.1.err
 Pre-crash binlog file content:
 include/show_binlog_events.inc
@@ -195,7 +196,7 @@ connection default;
 disconnect master1;
 disconnect master2;
 disconnect master3;
-# restart: --rpl-semi-sync-slave-enabled=1
+# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
 FOUND 1 /Successfully truncated.*to remove transactions starting from GTID 0-1-20/ in mysqld.1.err
 Pre-crash binlog file content:
 include/show_binlog_events.inc
@@ -234,4 +235,5 @@ DELETE FROM t;
 DROP PROCEDURE sp_xa;
 # Cleanup
 DROP TABLE t,t2,tm;
+SET @@global.sync_binlog= default;
 # End of the tests

mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result

@@ -1,5 +1,6 @@
 call mtr.add_suppression("Can.t init tc log");
 call mtr.add_suppression("Aborting");
+SET @@global.sync_binlog= 1;
 CREATE TABLE t1 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=Innodb;
 CREATE TABLE t2 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=rocksdb;
 #
@@ -30,9 +31,9 @@ Log_name	File_size
 master-bin.000001	#
 master-bin.000002	#
 master-bin.000003	#
-# restart the server with --rpl-semi-sync-slave-enabled=1
+# restart the server with --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
 # the server is restarted
-# restart: --rpl-semi-sync-slave-enabled=1
+# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
 connection default;
 #
 # *** Summary: 1 row should be present in both tables; binlog is truncated; number of binlogs at reconnect - 3:
@@ -97,7 +98,7 @@ INSERT INTO t2 VALUES (2, REPEAT("x", 4100));
 INSERT INTO t1 VALUES (2, REPEAT("x", 4100));
 COMMIT;
 connection default;
-# restart: --rpl-semi-sync-slave-enabled=1
+# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
 connection default;
 #
 # *** Summary: 2 rows should be present in both tables; no binlog truncation; one extra binlog file compare with A; number of binlogs at reconnect - 4:
@@ -154,9 +155,9 @@ Log_name	File_size
 master-bin.000001	#
 master-bin.000002	#
 master-bin.000003	#
-# restart the server with --rpl-semi-sync-slave-enabled=1
+# restart the server with --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
 # the server is restarted
-# restart: --rpl-semi-sync-slave-enabled=1
+# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
 connection default;
 #
 # *** Summary: 2 rows should be present in both tables; no binlog truncation; the same # of binlog files as in B; number of binlogs at reconnect - 4:
@@ -186,4 +187,5 @@ DELETE FROM t2;
 disconnect con1;
 #
 DROP TABLE t1, t2;
+SET @@global.sync_binlog= default;
 # End of the tests

mysql-test/suite/binlog/r/binlog_truncate_multi_log.result

@@ -1,6 +1,7 @@
 call mtr.add_suppression("Can.t init tc log");
 call mtr.add_suppression("Aborting");
 SET @@global.max_binlog_size= 4096;
+SET @@global.sync_binlog= 1;
 RESET MASTER;
 FLUSH LOGS;
 CREATE TABLE ti (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=Innodb;
@@ -13,11 +14,11 @@ master-bin.000001	#
 master-bin.000002	#
 INSERT INTO ti VALUES(1,"I am gonna survive");
 INSERT INTO tm VALUES(1,"me too!");
-SET DEBUG_SYNC= "commit_after_release_LOCK_after_binlog_sync SIGNAL master1_ready WAIT_FOR con1_go";
+SET DEBUG_SYNC= "commit_after_release_LOCK_after_binlog_sync SIGNAL master1_ready WAIT_FOR master1_go_never_arrives";
 INSERT INTO ti VALUES (2, REPEAT("x", 4100));
 connect master2,localhost,root,,;
 SET DEBUG_SYNC= "now WAIT_FOR master1_ready";
-SET DEBUG_SYNC= "commit_before_get_LOCK_commit_ordered SIGNAL master2_ready WAIT_FOR master2_go";
+SET DEBUG_SYNC= "commit_before_get_LOCK_commit_ordered SIGNAL master2_ready WAIT_FOR master2_go_never_arrives";
 INSERT INTO ti VALUES (3, "not gonna survive");
 connection default;
 SET DEBUG_SYNC= "now WAIT_FOR master2_ready";
@@ -35,7 +36,7 @@ connection default;
 # Kill the server
 disconnect master1;
 disconnect master2;
-# restart: --rpl-semi-sync-slave-enabled=1
+# restart: --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
 FOUND 1 /truncated binlog file:.*master.*000002/ in mysqld.1.err
 "One record should be present in table"
 SELECT * FROM ti;
@@ -50,4 +51,5 @@ SELECT @@global.gtid_binlog_pos;
 0-1-4
 # Cleanup
 DROP TABLE ti;
+SET @@global.sync_binlog= default;
 # End of the tests

mysql-test/suite/binlog/r/binlog_truncate_multi_log_unsafe.result

@@ -12,17 +12,19 @@ call mtr.add_suppression("mysqld: Table.*tm.*is marked as crashed");
 call mtr.add_suppression("Checking table.*tm");
 RESET MASTER;
 FLUSH LOGS;
+SET @@global.sync_binlog=1;
 CREATE TABLE ti (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=Innodb;
 CREATE TABLE tm (f INT) ENGINE=MYISAM;
 INSERT INTO tm VALUES(1);
 connect master1,localhost,root,,;
 connect master2,localhost,root,,;
 connect master3,localhost,root,,;
 connection master1;
-SET DEBUG_SYNC= "commit_after_release_LOCK_after_binlog_sync SIGNAL master1_ready WAIT_FOR master1_go";
+SET DEBUG_SYNC= "commit_after_release_LOCK_after_binlog_sync SIGNAL master1_ready WAIT_FOR master1_go_never_arrives";
 INSERT INTO ti VALUES (5 - 1, REPEAT("x", 4100));
 connection master2;
-SET DEBUG_SYNC= "commit_before_get_LOCK_commit_ordered SIGNAL master2_ready WAIT_FOR master2_go";
+SET DEBUG_SYNC= "now WAIT_FOR master1_ready";
+SET DEBUG_SYNC= "commit_before_get_LOCK_commit_ordered SIGNAL master2_ready WAIT_FOR master2_go_never_arrives";
 INSERT INTO ti VALUES (5, REPEAT("x", 1));
 connection master3;
 SET DEBUG_SYNC= "now WAIT_FOR master2_ready";

mysql-test/suite/binlog/r/show_concurrent_rotate.result

@@ -2,9 +2,10 @@ connect con1,localhost,root,,;
 FLUSH LOGS;
 FLUSH LOGS;
 FLUSH LOGS;
-SET DEBUG_SYNC= "at_after_lock_index WAIT_FOR con1_go";
+SET DEBUG_SYNC= "at_after_lock_index SIGNAL con1_ready WAIT_FOR con1_go";
 SHOW BINARY LOGS;
 connect con2,localhost,root,,;
+SET DEBUG_SYNC= "now WAIT_FOR con1_ready";
 RESET MASTER;
 FLUSH LOGS;
 SET DEBUG_SYNC= "now SIGNAL con1_go";

mysql-test/suite/binlog/t/binlog_truncate_active_log.inc

@@ -31,15 +31,15 @@ SELECT @@global.gtid_binlog_pos as 'Before the crash';
 #
 # Server restart
 #
---let $restart_parameters= --rpl-semi-sync-slave-enabled=1
+--let $restart_parameters= --rpl-semi-sync-slave-enabled=1 --sync-binlog=1
 --source include/start_mysqld.inc
 
 # Check error log for a successful truncate message.
 --let $log_error_ = $MYSQLTEST_VARDIR/log/mysqld.1.err
 
 --let SEARCH_FILE=$log_error_
 --let SEARCH_PATTERN=Successfully truncated.*to remove transactions starting from GTID $truncate_gtid_pos
- 
+
 --source include/search_pattern_in_file.inc
 
 --echo Pre-crash binlog file content: