Merge 10.8 into 10.9

MariaDB · Apr 28, 2022 · 504a3b3 · 504a3b3
2 parents 43fa8e0 + 133c212
commit 504a3b3
Show file tree

Hide file tree

Showing 306 changed files with 9,809 additions and 8,721 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -421,14 +421,12 @@ IF(WITH_UNIT_TESTS)
  ENDIF()
 ENDIF()
 
-INCLUDE(cpack_tgz)
-INCLUDE(cpack_rpm)
-INCLUDE(cpack_deb)
 
 UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE)
 
 INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb)
 
+INCLUDE(cpack_tgz)
 INCLUDE(cpack_rpm)
 INCLUDE(cpack_deb)
 

diff --git a/client/mysqldump.c b/client/mysqldump.c
@@ -279,7 +279,9 @@ static struct my_option my_long_options[] =
    &opt_slave_apply, &opt_slave_apply, 0, GET_BOOL, NO_ARG,
    0, 0, 0, 0, 0, 0},
   {"as-of", OPT_ASOF_TIMESTAMP,
-   "Dump system versioned table as of specified timestamp.",
+   "Dump system versioned table(s) as of specified timestamp. "
+   "Argument is interpreted according to the --tz-utc setting. "
+   "Table structures are always dumped as of current timestamp.",
    &opt_asof_timestamp, &opt_asof_timestamp, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"character-sets-dir", OPT_CHARSETS_DIR,
    "Directory for character set files.", (char **)&charsets_dir,
@@ -581,7 +583,8 @@ static struct my_option my_long_options[] =
    &opt_dump_triggers, &opt_dump_triggers, 0, GET_BOOL,
    NO_ARG, 1, 0, 0, 0, 0, 0},
   {"tz-utc", OPT_TZ_UTC,
-    "SET TIME_ZONE='+00:00' at top of dump to allow dumping of TIMESTAMP data when a server has data in different time zones or data is being moved between servers with different time zones.",
+   "Set connection time zone to UTC before commencing the dump and add "
+   "SET TIME_ZONE=´+00:00´ to the top of the dump file.",
     &opt_tz_utc, &opt_tz_utc, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 #ifndef DONT_ALLOW_USER_CHANGE
   {"user", 'u', "User for login if not current user.",

diff --git a/debian/control b/debian/control
@@ -290,6 +290,8 @@ Conflicts: mariadb-client-10.0,
            mariadb-client-core-10.4,
            mariadb-client-core-10.5,
            mariadb-client-core-10.6,
+           mariadb-client-core-10.7,
+           mariadb-client-core-10.8,
            mariadb-client-core-5.1,
            mariadb-client-core-5.2,
            mariadb-client-core-5.3,
@@ -345,6 +347,8 @@ Replaces: mariadb-client-10.0,
           mariadb-client-core-10.4,
           mariadb-client-core-10.5,
           mariadb-client-core-10.6,
+          mariadb-client-core-10.7,
+          mariadb-client-core-10.8,
           mariadb-client-core-5.1,
           mariadb-client-core-5.2,
           mariadb-client-core-5.3,
@@ -438,6 +442,7 @@ Breaks: mariadb-client-core-10.0,
         mariadb-client-core-10.6,
         mariadb-client-core-10.7,
         mariadb-client-core-10.8,
+        mariadb-client-core-10.9,
         mariadb-client-core (<< ${source:Version}),
         mariadb-server-10.0,
         mariadb-server-10.1,
@@ -448,6 +453,7 @@ Breaks: mariadb-client-core-10.0,
         mariadb-server-10.6,
         mariadb-server-10.7,
         mariadb-server-10.8,
+        mariadb-server-10.9,
         mariadb-server (<< ${source:Version}),
         mariadb-server-core-10.0,
         mariadb-server-core-10.1,
@@ -478,6 +484,9 @@ Replaces: mariadb-client (<< ${source:Version}),
           mariadb-client-10.4,
           mariadb-client-10.5,
           mariadb-client-10.6,
+          mariadb-client-10.7,
+          mariadb-client-10.8,
+          mariadb-client-10.9,
           mariadb-client-5.1,
           mariadb-client-5.2,
           mariadb-client-5.3,
@@ -568,6 +577,9 @@ Conflicts: mariadb-server-core-10.0,
            mariadb-server-core-10.4,
            mariadb-server-core-10.5,
            mariadb-server-core-10.6,
+           mariadb-server-core-10.7,
+           mariadb-server-core-10.8,
+           mariadb-server-core-10.9,
            mariadb-server-core-5.1,
            mariadb-server-core-5.2,
            mariadb-server-core-5.3,
@@ -589,6 +601,7 @@ Breaks: mariadb-client-10.0,
         mariadb-client-10.6,
         mariadb-client-10.7,
         mariadb-client-10.8,
+        mariadb-client-10.9,
         mariadb-client (<< ${source:Version}),
         mariadb-server-10.0,
         mariadb-server-10.1,
@@ -598,6 +611,7 @@ Breaks: mariadb-client-10.0,
         mariadb-server-10.6,
         mariadb-server-10.7,
         mariadb-server-10.8,
+        mariadb-server-10.9,
         mariadb-server (<< ${source:Version}),
         mysql-client-5.5,
         mysql-server-5.5,
@@ -700,6 +714,9 @@ Conflicts: mariadb-server (<< ${source:Version}),
            mariadb-server-10.4,
            mariadb-server-10.5,
            mariadb-server-10.6,
+           mariadb-server-10.7,
+           mariadb-server-10.8,
+           mariadb-server-10.9,
            mariadb-server-5.1,
            mariadb-server-5.2,
            mariadb-server-5.3,
@@ -742,6 +759,9 @@ Replaces: handlersocket-mysql-5.5,
           mariadb-server-10.4,
           mariadb-server-10.5,
           mariadb-server-10.6,
+          mariadb-server-10.7,
+          mariadb-server-10.8,
+          mariadb-server-10.9,
           mariadb-server (<< ${source:Version}),
           mariadb-server-5.1,
           mariadb-server-5.2,

diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
@@ -557,7 +557,47 @@ mysql-8.0 Focal to mariadb upgrade:
     variables:
       - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
 
-mariadb.org-10.6 to mariadb upgrade:
+mariadb.org-10.7 to mariadb-10.9 upgrade:
+  stage: upgrade extras
+  needs:
+    - job: build
+  image: debian:${RELEASE}
+  artifacts:
+    when: always
+    name: "$CI_BUILD_NAME"
+    paths:
+      - ${WORKING_DIR}/debug
+  script:
+    - *test-prepare-container
+    - apt install -y curl
+    - curl -sS https://mariadb.org/mariadb_release_signing_key.asc -o /etc/apt/trusted.gpg.d/mariadb.asc
+    - echo "deb https://deb.mariadb.org/10.7/debian ${RELEASE} main" > /etc/apt/sources.list.d/mariadb.list
+    - apt-get update
+    # Package libmariadbclient-dev from mariadb.org conflicts with libmariadb-dev in Sid, so cannot use wildcard that would include it
+    # Enable this line when there is a way to install them only from the mariadb.org repo
+    # - apt-get install -y 'mariadb*' libmariadb3 'libmariadb-*' 'libmariadbd*'
+    - apt-get install -y mariadb-server-10.7
+    - *test-verify-initial
+    # Install MariaDB built in this commit
+    # Force downgrades so our version installs on top of upstream revision, e.g. 1:10.5.5-1 vs 1:10.5.5+mariadb~sid
+    - apt-get install -y --allow-downgrades ./*.deb
+    # Verify installation of MariaDB built in this commit
+    - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
+    - mariadb --version # Client version
+    - service mariadb status # There is no init.d/mysql in MariaDB 10.8
+    - *test-verify-final
+  variables:
+    GIT_STRATEGY: none
+  except:
+    variables:
+      - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/
+  allow_failure: true
+  # Installation on Sid fails on missing liburing1 because upstream 10.8
+  # MariaDB.org buildbot has not run 'apt upgrade' for a long time.
+  # Remove this allow_failure once buildbot has built a new 10.8
+  # release using latest liburing-dev in Debian Sid.
+
+mariadb.org-10.6 to mariadb-10.8 upgrade:
   stage: upgrade extras
   needs:
     - job: build

diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc
@@ -55,6 +55,7 @@ Street, Fifth Floor, Boston, MA 02110-1335 USA
 #include "xtrabackup.h"
 #include "common.h"
 #include "backup_copy.h"
+#include "backup_debug.h"
 #include "backup_mysql.h"
 #include <btr0btr.h>
 
@@ -1443,6 +1444,13 @@ bool backup_start(CorruptedPages &corrupted_pages)
 
 	msg("Waiting for log copy thread to read lsn %llu", (ulonglong)server_lsn_after_lock);
 	backup_wait_for_lsn(server_lsn_after_lock);
+	DBUG_EXECUTE_FOR_KEY("sleep_after_waiting_for_lsn", {},
+		{
+			ulong milliseconds = strtoul(dbug_val, NULL, 10);
+			msg("sleep_after_waiting_for_lsn");
+			my_sleep(milliseconds*1000UL);
+		});
+
 	backup_fix_ddl(corrupted_pages);
 
 	// There is no need to stop slave thread before coping non-Innodb data when

diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
@@ -3216,7 +3216,7 @@ static void log_copying_thread()
          (!metadata_to_lsn || metadata_to_lsn > recv_sys.lsn))
   {
     timespec abstime;
-    set_timespec_nsec(abstime, 1000ULL * xtrabackup_log_copy_interval);
+    set_timespec_nsec(abstime, 1000000ULL * xtrabackup_log_copy_interval);
     mysql_cond_timedwait(&log_copying_stop, &recv_sys.mutex, &abstime);
   }
   log_copying_running= false;
@@ -6830,7 +6830,7 @@ int main(int argc, char **argv)
 	key_map_full.set_all();
 
 	logger.init_base();
-	logger.set_handlers(LOG_FILE, LOG_NONE, LOG_NONE);
+	logger.set_handlers(LOG_NONE, LOG_NONE);
 	mysql_mutex_init(key_LOCK_error_log, &LOCK_error_log,
 			 MY_MUTEX_INIT_FAST);
 

diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt
@@ -94,7 +94,6 @@ ${WOLFCRYPT_SRCDIR}/md5.c
 ${WOLFCRYPT_SRCDIR}/memory.c
 ${WOLFCRYPT_SRCDIR}/pkcs12.c
 ${WOLFCRYPT_SRCDIR}/pwdbased.c
-${WOLFCRYPT_SRCDIR}/rabbit.c
 ${WOLFCRYPT_SRCDIR}/random.c
 ${WOLFCRYPT_SRCDIR}/rsa.c
 ${WOLFCRYPT_SRCDIR}/sha.c

diff --git a/include/my_compiler.h b/include/my_compiler.h
@@ -2,7 +2,7 @@
 #define MY_COMPILER_INCLUDED
 
 /* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
-   Copyright (c) 2017, 2020, MariaDB Corporation.
+   Copyright (c) 2017, 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
@@ -39,15 +39,8 @@
 
 /* GNU C/C++ */
 #if defined __GNUC__
-/* Convenience macro to test the minimum required GCC version. */
-# define MY_GNUC_PREREQ(maj, min) \
-    ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-/* Any after 2.95... */
 # define MY_ALIGN_EXT
-/* Comunicate to the compiler the unreachability of the code. */
-# if MY_GNUC_PREREQ(4,5)
-#   define MY_ASSERT_UNREACHABLE()   __builtin_unreachable()
-# endif
+# define MY_ASSERT_UNREACHABLE()   __builtin_unreachable()
 
 /* Microsoft Visual C++ */
 #elif defined _MSC_VER
@@ -84,10 +77,6 @@
   Generic (compiler-independent) features.
 */
 
-#ifndef MY_GNUC_PREREQ
-# define MY_GNUC_PREREQ(maj, min) (0)
-#endif
-
 #ifndef MY_ALIGNOF
 # ifdef __cplusplus
     template<typename type> struct my_alignof_helper { char m1; type m2; };
@@ -158,7 +147,6 @@ struct my_aligned_storage
 #ifdef __GNUC__
 # define ATTRIBUTE_NORETURN __attribute__((noreturn))
 # define ATTRIBUTE_NOINLINE __attribute__((noinline))
-# if MY_GNUC_PREREQ(4,3)
 /** Starting with GCC 4.3, the "cold" attribute is used to inform the
 compiler that a function is unlikely executed.  The function is
 optimized for size rather than speed and on many targets it is placed
@@ -167,8 +155,7 @@ appears close together improving code locality of non-cold parts of
 program.  The paths leading to call of cold functions within code are
 marked as unlikely by the branch prediction mechanism.  optimize a
 rarely invoked function for size instead for speed. */
-#  define ATTRIBUTE_COLD __attribute__((cold))
-# endif
+# define ATTRIBUTE_COLD __attribute__((cold))
 #elif defined _MSC_VER
 # define ATTRIBUTE_NORETURN __declspec(noreturn)
 # define ATTRIBUTE_NOINLINE __declspec(noinline)

diff --git a/include/my_valgrind.h b/include/my_valgrind.h
@@ -83,12 +83,6 @@
 # define MSAN_STAT_WORKAROUND(st) ((void) 0)
 #endif /* __has_feature(memory_sanitizer) */
 
-#ifdef HAVE_valgrind
-#define IF_VALGRIND(A,B) A
-#else
-#define IF_VALGRIND(A,B) B
-#endif
-
 #ifdef TRASH_FREED_MEMORY
 /*
   _TRASH_FILL() has to call MEM_MAKE_ADDRESSABLE() to cancel any effect of